Move optimization mode backup timing into onPause
- Move to onPause to avoid some corner case (like kill apps from recent app won't trigger onDestroy) Bug: 195306545 Test: make SettingsRoboTests Change-Id: I89445a7138c30e6c869ce1c5c9a3f818997d99a7
This commit is contained in:
@@ -289,22 +289,16 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
|
|||||||
if (mEnableTriState) {
|
if (mEnableTriState) {
|
||||||
final int selectedPreference = getSelectedPreference();
|
final int selectedPreference = getSelectedPreference();
|
||||||
|
|
||||||
|
notifyBackupManager();
|
||||||
logMetricCategory(selectedPreference);
|
logMetricCategory(selectedPreference);
|
||||||
mBatteryOptimizeUtils.setAppUsageState(selectedPreference);
|
mBatteryOptimizeUtils.setAppUsageState(selectedPreference);
|
||||||
Log.d(TAG, "Leave with mode: " + selectedPreference);
|
Log.d(TAG, "Leave with mode: " + selectedPreference);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onDestroy() {
|
|
||||||
super.onDestroy();
|
|
||||||
notifyBackupManager();
|
|
||||||
}
|
|
||||||
|
|
||||||
@VisibleForTesting
|
@VisibleForTesting
|
||||||
void notifyBackupManager() {
|
void notifyBackupManager() {
|
||||||
if (mEnableTriState
|
if (mOptimizationMode != mBatteryOptimizeUtils.getAppOptimizationMode()) {
|
||||||
&& mOptimizationMode != mBatteryOptimizeUtils.getAppOptimizationMode()) {
|
|
||||||
final BackupManager backupManager = mBackupManager != null
|
final BackupManager backupManager = mBackupManager != null
|
||||||
? mBackupManager : new BackupManager(getContext());
|
? mBackupManager : new BackupManager(getContext());
|
||||||
backupManager.dataChanged();
|
backupManager.dataChanged();
|
||||||
|
@@ -856,7 +856,7 @@ public class AdvancedPowerUsageDetailTest {
|
|||||||
.thenReturn(BatteryOptimizeUtils.MODE_UNRESTRICTED);
|
.thenReturn(BatteryOptimizeUtils.MODE_UNRESTRICTED);
|
||||||
mFragment.mEnableTriState = false;
|
mFragment.mEnableTriState = false;
|
||||||
|
|
||||||
mFragment.notifyBackupManager();
|
mFragment.onPause();
|
||||||
|
|
||||||
verifyZeroInteractions(mBackupManager);
|
verifyZeroInteractions(mBackupManager);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user