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

Commit cc26673d authored by Abel Tesfaye's avatar Abel Tesfaye Committed by Automerger Merge Worker
Browse files

Merge "Fix battery saver not disabling adaptive sleep switch" into sc-dev am:... 

Merge "Fix battery saver not disabling adaptive sleep switch" into sc-dev am: b8c610b1 am: 02c94196

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

Change-Id: I177596b7d596184cbfe700389d2b4dd35b5b003b
parents d009484a 02c94196

src/com/android/settings/display/AdaptiveSleepPreferenceController.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -90,6 +90,7 @@ public class AdaptiveSleepPreferenceController { 
        if (enforcedAdmin != null) {

        if (enforcedAdmin != null) {

            mPreference.setDisabledByAdmin(enforcedAdmin);

            mPreference.setDisabledByAdmin(enforcedAdmin);

        } else {

        } else {

            mPreference.setChecked(isChecked());

            mPreference.setEnabled(hasSufficientPermission(mPackageManager) && !isCameraLocked()

            mPreference.setEnabled(hasSufficientPermission(mPackageManager) && !isCameraLocked()

                    && !isPowerSaveMode());

                    && !isPowerSaveMode());

        }

        }

src/com/android/settings/display/ScreenTimeoutSettings.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -81,6 +81,7 @@ public class ScreenTimeoutSettings extends RadioButtonPickerFragment implements 
        @Override

        @Override

        public void onReceive(Context context, Intent intent) {

        public void onReceive(Context context, Intent intent) {

            mAdaptiveSleepBatterySaverPreferenceController.updateVisibility();

            mAdaptiveSleepBatterySaverPreferenceController.updateVisibility();

            mAdaptiveSleepController.updatePreference();

        }

        }

    };

    };