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

Commit 02c94196 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: b8c610b1 

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

Change-Id: Ib37a1f8280a7cef805545b88f09ea85fde83a076
parents 6cb273d8 b8c610b1

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

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

            mPreference.setDisabledByAdmin(enforcedAdmin);

        } else {

            mPreference.setChecked(isChecked());

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

                    && !isPowerSaveMode());

        }

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

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

        public void onReceive(Context context, Intent intent) {

            mAdaptiveSleepBatterySaverPreferenceController.updateVisibility();

            mAdaptiveSleepController.updatePreference();

        }

    };