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

Commit f8bd1ec6 authored by Pavel Grafov's avatar Pavel Grafov Committed by Android (Google) Code Review
Browse files

Merge "Remove mention of a defunct hidden setting" into main

parents 19f942c2 7783d863

core/java/android/app/admin/DevicePolicyManager.java

+0 −1
Original line number Original line Diff line number Diff line
@@ -12731,7 +12731,6 @@ public class DevicePolicyManager { 
    @StringDef({

    @StringDef({

            Settings.System.SCREEN_BRIGHTNESS_MODE,

            Settings.System.SCREEN_BRIGHTNESS_MODE,

            Settings.System.SCREEN_BRIGHTNESS,

            Settings.System.SCREEN_BRIGHTNESS,

            Settings.System.SCREEN_BRIGHTNESS_FLOAT,

            Settings.System.SCREEN_OFF_TIMEOUT

            Settings.System.SCREEN_OFF_TIMEOUT

    })

    })

    @Retention(RetentionPolicy.SOURCE)

    @Retention(RetentionPolicy.SOURCE)

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+0 −1
Original line number Original line Diff line number Diff line
@@ -727,7 +727,6 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
















        SYSTEM_SETTINGS_ALLOWLIST = new ArraySet<>();







        SYSTEM_SETTINGS_ALLOWLIST = new ArraySet<>();











        SYSTEM_SETTINGS_ALLOWLIST.add(Settings.System.SCREEN_BRIGHTNESS);







        SYSTEM_SETTINGS_ALLOWLIST.add(Settings.System.SCREEN_BRIGHTNESS);











        SYSTEM_SETTINGS_ALLOWLIST.add(Settings.System.SCREEN_BRIGHTNESS_FLOAT);














        SYSTEM_SETTINGS_ALLOWLIST.add(Settings.System.SCREEN_BRIGHTNESS_MODE);







        SYSTEM_SETTINGS_ALLOWLIST.add(Settings.System.SCREEN_BRIGHTNESS_MODE);











        SYSTEM_SETTINGS_ALLOWLIST.add(Settings.System.SCREEN_OFF_TIMEOUT);







        SYSTEM_SETTINGS_ALLOWLIST.add(Settings.System.SCREEN_OFF_TIMEOUT);