Merge "Move optimization mode backup timing into onPause" into sc-v2-dev

src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java

@@ -289,22 +289,16 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
         if (mEnableTriState) {
             final int selectedPreference = getSelectedPreference();
 
+            notifyBackupManager();
             logMetricCategory(selectedPreference);
             mBatteryOptimizeUtils.setAppUsageState(selectedPreference);
             Log.d(TAG, "Leave with mode: " + selectedPreference);
         }
     }
 
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-        notifyBackupManager();
-    }
-
     @VisibleForTesting
     void notifyBackupManager() {
-        if (mEnableTriState
-                && mOptimizationMode != mBatteryOptimizeUtils.getAppOptimizationMode()) {
+        if (mOptimizationMode != mBatteryOptimizeUtils.getAppOptimizationMode()) {
             final BackupManager backupManager = mBackupManager != null
                     ? mBackupManager : new BackupManager(getContext());
             backupManager.dataChanged();

tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java

@@ -856,7 +856,7 @@ public class AdvancedPowerUsageDetailTest {
                 .thenReturn(BatteryOptimizeUtils.MODE_UNRESTRICTED);
         mFragment.mEnableTriState = false;
 
-        mFragment.notifyBackupManager();
+        mFragment.onPause();
 
         verifyZeroInteractions(mBackupManager);
     }