Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d11dec2f authored by Wesley.CW Wang's avatar Wesley.CW Wang Committed by Wesley Wang
Browse files

Revert "Add PowerSaveWhitelistExceptIdle as Optimizted modes condition" 

 - Reverts commit e7cca4cd
 - Add try-catch to handle unexpected operate

Reason for revert: Previous fix will cause a side effect which makes app stuck at Optimize mode after switching state from Unrestricted to Optimize, add a try catch to handle previous issue first

BYPASS_INCLUSIVE_LANGUAGE_REASON=legacy naming, not edit by this code change

Bug: 199892006
Test: make SettingsRoboTests
Change-Id: I3b1850ab66bbf4cd605f14152a244a8ed7edd578
Merged-In: I3b1850ab66bbf4cd605f14152a244a8ed7edd578
parent 3efe6e59

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

+1 −2
Original line number Diff line number Diff line
@@ -361,8 +361,7 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements 
        final String stateString;

        final String footerString;



        if (!mBatteryOptimizeUtils.isValidPackageName()

                || mBatteryOptimizeUtils.isAllowlistedExceptIdleApp()) {

        if (!mBatteryOptimizeUtils.isValidPackageName()) {

            // 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);

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

+9 −8
Original line number Diff line number Diff line
@@ -89,8 +89,16 @@ public class BatteryOptimizeUtils { 
        return getAppOptimizationMode(mMode, mAllowListed);

    }



    /** Sets the {@link OptimizationMode} for associated app. */

    public void setAppOptimizationMode(@OptimizationMode int mode) {

        try {

            setAppUsageStateInternal(mode);

        } catch (Exception e) {

            Log.e(TAG, "setAppUsageState() is failed for " + mPackageName, e);

        }

    }



    /** Sets the {@link OptimizationMode} for associated app. */

    public void setAppUsageStateInternal(@OptimizationMode int mode) {

        if (getAppOptimizationMode(mMode, mAllowListed) == mode) {

            Log.w(TAG, "set the same optimization mode for: " + mPackageName);

            return;
@@ -130,13 +138,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

+0 −4
Original line number Diff line number Diff line
@@ -57,10 +57,6 @@ public class OptimizedPreferenceController extends AbstractPreferenceController 
            Log.d(TAG, "is system or default app, disable pref");

            ((RadioButtonPreference) 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);

            ((RadioButtonPreference) preference).setChecked(true);

        } else if (mBatteryOptimizeUtils.getAppOptimizationMode()

                == BatteryOptimizeUtils.MODE_OPTIMIZED) {

            Log.d(TAG, "is optimized states");

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

+0 −3
Original line number Diff line number Diff line
@@ -55,9 +55,6 @@ public class RestrictedPreferenceController extends AbstractPreferenceController 
            Log.d(TAG, "is system or default app, disable pref");

            ((RadioButtonPreference) 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

+0 −3
Original line number Diff line number Diff line
@@ -53,9 +53,6 @@ public class UnrestrictedPreferenceController extends AbstractPreferenceControll 
        if (mBatteryOptimizeUtils.isSystemOrDefaultApp()) {

            Log.d(TAG, "is system or default app, unrestricted states only");

            ((RadioButtonPreference) 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");