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

Commit b8c610b1 authored by Abel Tesfaye's avatar Abel Tesfaye Committed by Android (Google) Code Review
Browse files

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

parents d0adfa7b 384bed50

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

        }

    };