Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Provider Model] Check against race condition"

Browse Source
This commit is contained in:
Etan Cohen
2021-01-21 14:55:49 +00:00
committed by Android (Google) Code Review
parent 126edfe890 dd295df643
commit 3df00e17f7
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SettingsLib/src/com/android/settingslib/connectivity/ConnectivitySubsystemsRecoveryManager.java
View File

@@ -210,7 +210,8 @@ public class ConnectivitySubsystemsRecoveryManager {
}
private void checkIfAllSubsystemsRestartsAreDone() {
if (!mWifiRestartInProgress && !mTelephonyRestartInProgress) {
if (!mWifiRestartInProgress && !mTelephonyRestartInProgress
&& mCurrentRecoveryCallback != null) {
mCurrentRecoveryCallback.onSubsystemRestartOperationEnd();
mCurrentRecoveryCallback = null;
}
@@ -283,8 +284,10 @@ public class ConnectivitySubsystemsRecoveryManager {
stopTrackingTelephonyRestart();
mWifiRestartInProgress = false;
mTelephonyRestartInProgress = false;
mCurrentRecoveryCallback.onSubsystemRestartOperationEnd();
mCurrentRecoveryCallback = null;
if (mCurrentRecoveryCallback != null) {
mCurrentRecoveryCallback.onSubsystemRestartOperationEnd();
mCurrentRecoveryCallback = null;
}
}, RESTART_TIMEOUT_MS);
}
});