PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move optimization mode backup timing into onPause" into sc-v2-dev am: bf9f91f0ad am: e67f12f9b7

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16177444

Change-Id: I1f9c5dd515fa42c7a30f86f9c7b135b39ff67cc5
This commit is contained in:
Wesley Wang
2021-11-03 07:06:04 +00:00
committed by Automerger Merge Worker
parent d13834de52 e67f12f9b7
commit 0f3a672a94
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
View File

@@ -290,22 +290,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();

2
tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
View File

@@ -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);
} }