summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Pavel Grafov <pgrafov@google.com> 2024-03-28 18:53:40 +0000
committer Pavel Grafov <pgrafov@google.com> 2024-03-28 19:31:48 +0000
commit7783d863283e95cebc09ea748cc546f32b62bc71 (patch)
tree9490b937d170ae3d0ef0980031255e02c2978b2e
parentae929258e5aa650a6f31e61ef016bcfce0067593 (diff)
Remove mention of a defunct hidden setting
Also removed the setting from the allowlist - this in theory can break apps that somehow ended up using it. I expect there are no such apps and nobody is using it, since it doesn't have @UnsupportedAppUsage, so to use it someone would actually have to copy it from the code. Bug: 331750107 Change-Id: I8b3fb97f85075ea4faae90653bb10744318072dc Test: TH
-rw-r--r--core/java/android/app/admin/DevicePolicyManager.java1
-rw-r--r--services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java1
2 files changed, 0 insertions, 2 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index 411f7f7bb96c..42e82f6d77c0 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -12731,7 +12731,6 @@ public class DevicePolicyManager {
@StringDef({
Settings.System.SCREEN_BRIGHTNESS_MODE,
Settings.System.SCREEN_BRIGHTNESS,
- Settings.System.SCREEN_BRIGHTNESS_FLOAT,
Settings.System.SCREEN_OFF_TIMEOUT
})
@Retention(RetentionPolicy.SOURCE)
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index 318042e87387..b34092ca280f 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -727,7 +727,6 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
SYSTEM_SETTINGS_ALLOWLIST = new ArraySet<>();
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_OFF_TIMEOUT);