Revert "Add PowerSaveWhitelistExceptIdle as Optimizted modes condition"

This reverts commit 3f7839cad0.

Reason for revert: This fix will cause a side effect which makes app switch state from Unrestricted to Optimize then it will lock at Optimize mode only, will prepare other cl to fix the previous issue

Change-Id: Ic5232eb0099fa1591f15e72747eca4d08b9af9b9

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

@@ -19,8 +19,8 @@ package com.android.settings.fuelgauge;
 import android.annotation.UserIdInt;
 import android.app.Activity;
 import android.app.ActivityManager;
-import android.app.backup.BackupManager;
 import android.app.settings.SettingsEnums;
+import android.app.backup.BackupManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -362,20 +362,18 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
         final String stateString;
         final String footerString;
 
-        if (!mBatteryOptimizeUtils.isValidPackageName()
+        if (!mBatteryOptimizeUtils.isValidPackageName()) {
-                || mBatteryOptimizeUtils.isAllowlistedExceptIdleApp()) {
+            //Present optimized only string when the package name is invalid.
-            // Present optimized only string when the package name is invalid or
-            // it's in allow list not idle app.
             stateString = context.getString(R.string.manager_battery_usage_optimized_only);
             footerString = context.getString(
                     R.string.manager_battery_usage_footer_limited, stateString);
         } else if (mBatteryOptimizeUtils.isSystemOrDefaultApp()) {
-            // Present unrestricted only string when the package is system or default active app.
+            //Present unrestricted only string when the package is system or default active app.
             stateString = context.getString(R.string.manager_battery_usage_unrestricted_only);
             footerString = context.getString(
                     R.string.manager_battery_usage_footer_limited, stateString);
         } else {
-            // Present default string to normal app.
+            //Present default string to normal app.
             footerString = context.getString(R.string.manager_battery_usage_footer);
         }
         mFooterPreference.setTitle(footerString);

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

@@ -130,13 +130,6 @@ public class BatteryOptimizeUtils {
                 || mPowerAllowListBackend.isDefaultActiveApp(mPackageName);
     }
 
-    /**
-     * Return {@code true} if this package is in allow list except idle app.
-     */
-    public boolean isAllowlistedExceptIdleApp() {
-        return mPowerAllowListBackend.isAllowlistedExceptIdle(mPackageName);
-    }
-
     String getPackageName() {
         return mPackageName == null ? UNKNOWN_PACKAGE : mPackageName;
     }

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

@@ -57,10 +57,6 @@ public class OptimizedPreferenceController extends AbstractPreferenceController
             Log.d(TAG, "is system or default app, disable pref");
             ((SelectorWithWidgetPreference) preference).setChecked(false);
             preference.setEnabled(false);
-        } else if (mBatteryOptimizeUtils.isAllowlistedExceptIdleApp()) {
-            Log.d(TAG, "in allow list not idle app, optimized states only");
-            preference.setEnabled(true);
-            ((SelectorWithWidgetPreference) preference).setChecked(true);
         } else if (mBatteryOptimizeUtils.getAppOptimizationMode()
                 == BatteryOptimizeUtils.MODE_OPTIMIZED) {
             Log.d(TAG, "is optimized states");

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

@@ -55,9 +55,6 @@ public class RestrictedPreferenceController extends AbstractPreferenceController
             Log.d(TAG, "is system or default app, disable pref");
             ((SelectorWithWidgetPreference) preference).setChecked(false);
             preference.setEnabled(false);
-        } else if (mBatteryOptimizeUtils.isAllowlistedExceptIdleApp()) {
-            Log.d(TAG, "in allow list not idle app, disable perf");
-            preference.setEnabled(false);
         } else if (mBatteryOptimizeUtils.getAppOptimizationMode()
                 == BatteryOptimizeUtils.MODE_RESTRICTED) {
             Log.d(TAG, "is restricted states");

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

@@ -53,9 +53,6 @@ public class UnrestrictedPreferenceController extends AbstractPreferenceControll
         if (mBatteryOptimizeUtils.isSystemOrDefaultApp()) {
             Log.d(TAG, "is system or default app, unrestricted states only");
             ((SelectorWithWidgetPreference) preference).setChecked(true);
-        } else if (mBatteryOptimizeUtils.isAllowlistedExceptIdleApp()) {
-            Log.d(TAG, "in allow list not idle app, disable perf");
-            preference.setEnabled(false);
         } else if (mBatteryOptimizeUtils.getAppOptimizationMode()
                 == BatteryOptimizeUtils.MODE_UNRESTRICTED) {
             Log.d(TAG, "is unrestricted states");

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

@@ -745,16 +745,6 @@ public class AdvancedPowerUsageDetailTest {
                 .isEqualTo("This app requires optimized battery usage.");
     }
 
-    @Test
-    public void testInitPreferenceForTriState_isAllowlistedExceptIdleApp_hasCorrectString() {
-        when(mBatteryOptimizeUtils.isAllowlistedExceptIdleApp()).thenReturn(true);
-
-        mFragment.initPreferenceForTriState(mContext);
-
-        assertThat(mFooterPreference.getTitle().toString())
-                .isEqualTo("This app requires optimized battery usage.");
-    }
-
     @Test
     public void testInitPreferenceForTriState_isSystemOrDefaultApp_hasCorrectString() {
         when(mBatteryOptimizeUtils.isValidPackageName()).thenReturn(true);

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

@@ -124,18 +124,6 @@ public class BatteryOptimizeUtilsTest {
         assertThat(mBatteryOptimizeUtils.isValidPackageName()).isTrue();
     }
 
-    @Test
-    public void testIsAllowlistedExpectIdle_isAllowlistedExceptIdle_returnTrue() {
-        when(mMockBackend.isAllowlistedExceptIdle(anyString())).thenReturn(true);
-
-        assertThat(mBatteryOptimizeUtils.isAllowlistedExceptIdleApp()).isTrue();
-    }
-
-    @Test
-    public void testIsAllowlistedExpectIdle_notAllowlistedExpectIdle_returnFalse() {
-        assertThat(mBatteryOptimizeUtils.isAllowlistedExceptIdleApp()).isFalse();
-    }
-
     @Test
     public void testSetAppOptimizationMode_Restricted_verifyAction() {
         // Sets the current mode as MODE_UNRESTRICTED.

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

@@ -93,16 +93,6 @@ public class OptimizedPreferenceControllerTest {
         assertThat(mPreference.isChecked()).isFalse();
     }
 
-    @Test
-    public void testUpdateState_isAllowlistedExceptIdleApp_prefEnabled() {
-        when(mockBatteryOptimizeUtils.isAllowlistedExceptIdleApp()).thenReturn(true);
-
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.isEnabled()).isTrue();
-        assertThat(mPreference.isChecked()).isTrue();
-    }
-
     @Test
     public void testHandlePreferenceTreeClick_samePrefKey_verifyAction() {
         mPreference.setKey(mController.KEY_OPTIMIZED_PREF);

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

@@ -101,16 +101,6 @@ public class RestrictedPreferenceControllerTest {
         assertThat(mPreference.isChecked()).isFalse();
     }
 
-    @Test
-    public void testUpdateState_isAllowlistedExceptIdleApp_prefDisabled() {
-        when(mockBatteryOptimizeUtils.isAllowlistedExceptIdleApp()).thenReturn(true);
-
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.isChecked()).isFalse();
-        assertThat(mPreference.isEnabled()).isFalse();
-    }
-
     @Test
     public void testHandlePreferenceTreeClick_samePrefKey_verifyAction() {
         mPreference.setKey(mController.KEY_RESTRICTED_PREF);

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

@@ -101,16 +101,6 @@ public class UnrestrictedPreferenceControllerTest {
         assertThat(mPreference.isChecked()).isFalse();
     }
 
-    @Test
-    public void testUpdateState_isAllowlistedExceptIdleApp_prefDisabled() {
-        when(mockBatteryOptimizeUtils.isAllowlistedExceptIdleApp()).thenReturn(true);
-
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.isChecked()).isFalse();
-        assertThat(mPreference.isEnabled()).isFalse();
-    }
-
     @Test
     public void testHandlePreferenceTreeClick_samePrefKey_verifyAction() {
         mPreference.setKey(mController.KEY_UNRESTRICTED_PREF);