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

Commit ad735320 authored by Christopher Tate's avatar Christopher Tate
Browse files

Refer to STAY_ON_WHILE_PLUGGED_IN in the global namespace 

This is the one relevant setting that moved from System to Global,
a move that we do not automatically redirect on writes.

Change-Id: I7b26d0c364695c4a10a7cd477db3dfcfe89d7ef5
parent 4db5d23d

services/java/com/android/server/power/PowerManagerService.java

+6 −6
Original line number Diff line number Diff line
@@ -372,8 +372,8 @@ public final class PowerManagerService extends IPowerManager.Stub 
                    Settings.Secure.SCREENSAVER_ACTIVATE_ON_SLEEP), false, mSettingsObserver);

            resolver.registerContentObserver(Settings.System.getUriFor(

                    Settings.System.SCREEN_OFF_TIMEOUT), false, mSettingsObserver);

            resolver.registerContentObserver(Settings.System.getUriFor(

                    Settings.System.STAY_ON_WHILE_PLUGGED_IN), false, mSettingsObserver);

            resolver.registerContentObserver(Settings.Global.getUriFor(

                    Settings.Global.STAY_ON_WHILE_PLUGGED_IN), false, mSettingsObserver);

            resolver.registerContentObserver(Settings.System.getUriFor(

                    Settings.System.SCREEN_BRIGHTNESS), false, mSettingsObserver);

            resolver.registerContentObserver(Settings.System.getUriFor(
@@ -405,8 +405,8 @@ public final class PowerManagerService extends IPowerManager.Stub 
                Settings.Secure.SCREENSAVER_ACTIVATE_ON_SLEEP, 0) != 0);

        mScreenOffTimeoutSetting = Settings.System.getInt(resolver,

                Settings.System.SCREEN_OFF_TIMEOUT, DEFAULT_SCREEN_OFF_TIMEOUT);

        mStayOnWhilePluggedInSetting = Settings.System.getInt(resolver,

                Settings.System.STAY_ON_WHILE_PLUGGED_IN,

        mStayOnWhilePluggedInSetting = Settings.Global.getInt(resolver,

                Settings.Global.STAY_ON_WHILE_PLUGGED_IN,

                BatteryManager.BATTERY_PLUGGED_AC);



        final int oldScreenBrightnessSetting = mScreenBrightnessSetting;
@@ -1585,8 +1585,8 @@ public final class PowerManagerService extends IPowerManager.Stub 
    }



    private void setStayOnSettingInternal(int val) {

        Settings.System.putInt(mContext.getContentResolver(),

                Settings.System.STAY_ON_WHILE_PLUGGED_IN, val);

        Settings.Global.putInt(mContext.getContentResolver(),

                Settings.Global.STAY_ON_WHILE_PLUGGED_IN, val);

    }



    /**