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

Commit 5b7e06bd authored by ykhung's avatar ykhung Committed by Automerger Merge Worker
Browse files

Disable the optimization mode preference if the app is not settable am: 5cd3a729 

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



Change-Id: I2fcd5233d90b56ee796e4276ccd44918e0cdabd7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 267a9a14 5cd3a729

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

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

        final String footerString;



        if (!mBatteryOptimizeUtils.isValidPackageName()) {

        if (mBatteryOptimizeUtils.isDisabledForOptimizeModeOnly()) {

            // Present optimized only string when the package name is invalid.

            stateString = context.getString(R.string.manager_battery_usage_optimized_only);

            footerString = context.getString(

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

+4 −5
Original line number Diff line number Diff line
@@ -128,11 +128,10 @@ public class BatteryOptimizeUtils { 
                mContext, mode, mUid, mPackageName, mBatteryUtils, mPowerAllowListBackend, action);

    }



    /**

     * Return {@code true} if package name is valid (can get an uid).

     */

    public boolean isValidPackageName() {

        return mBatteryUtils.getPackageUid(mPackageName) != BatteryUtils.UID_NULL;

    /** Return {@code true} if it is disabled for default optimized mode only. */

    public boolean isDisabledForOptimizeModeOnly() {

        return getAllowList(mContext).contains(mPackageName)

                || mBatteryUtils.getPackageUid(mPackageName) == BatteryUtils.UID_NULL;

    }



    /**

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

+2 −2
Original line number Diff line number Diff line
@@ -46,8 +46,8 @@ public class OptimizedPreferenceController extends AbstractPreferenceController 


    @Override

    public void updateState(Preference preference) {

        if (!mBatteryOptimizeUtils.isValidPackageName()) {

            Log.d(TAG, "invalid package name, optimized states only");

        if (mBatteryOptimizeUtils.isDisabledForOptimizeModeOnly()) {

            Log.d(TAG, "disable preference for " + mBatteryOptimizeUtils.getPackageName());

            preference.setEnabled(true);

            ((SelectorWithWidgetPreference) preference).setChecked(true);

            return;

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

+2 −3
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
 * limitations under the License.

 */





package com.android.settings.fuelgauge;



import android.content.Context;
@@ -43,8 +42,8 @@ public class RestrictedPreferenceController extends AbstractPreferenceController 
    @Override

    public void updateState(Preference preference) {



        if (!mBatteryOptimizeUtils.isValidPackageName()) {

            Log.d(TAG, "invalid package name, disable pref");

        if (mBatteryOptimizeUtils.isDisabledForOptimizeModeOnly()) {

            Log.d(TAG, "disable preference for " + mBatteryOptimizeUtils.getPackageName());

            preference.setEnabled(false);

            return;

        } else {

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

+2 −2
Original line number Diff line number Diff line
@@ -42,8 +42,8 @@ public class UnrestrictedPreferenceController extends AbstractPreferenceControll 
    @Override

    public void updateState(Preference preference) {



        if (!mBatteryOptimizeUtils.isValidPackageName()) {

            Log.d(TAG, "invalid package name, disable pref");

        if (mBatteryOptimizeUtils.isDisabledForOptimizeModeOnly()) {

            Log.d(TAG, "disable preference for " + mBatteryOptimizeUtils.getPackageName());

            preference.setEnabled(false);

            return;

        } else {