commit be49e61d0f9d666b7e598a72999f3870fffd83f0
author Chaohui Wang <chaohuiw@google.com> Tue Mar 12 18:30:52 2024 +0800
committer Chaohui Wang <chaohuiw@google.com> Mon Mar 18 03:32:54 2024 +0000
tree 0d1d93a23a416f034516844cd960279ce82211a5
parent 42be6f6e8894e9f09324f3e4d81df651a83b9a64

Enforce BaseUserRestriction for DISALLOW_CONFIG_BRIGHTNESS

Fix: 329205638
Test: pm set-user-restriction --user 0 no_config_brightness 1
Change-Id: Icacf051789ea40d23cd29c16168fbeb204cf8f5b

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

diff --git a/src/com/android/settings/display/BrightnessLevelPreferenceController.java b/src/com/android/settings/display/BrightnessLevelPreferenceController.java
index ac1a1cb..468a1d8 100644
--- a/src/com/android/settings/display/BrightnessLevelPreferenceController.java
+++ b/src/com/android/settings/display/BrightnessLevelPreferenceController.java
@@ -31,6 +31,8 @@
 import android.net.Uri;
 import android.os.Handler;
 import android.os.Looper;
+import android.os.Process;
+import android.os.UserManager;
 import android.provider.Settings.System;
 import android.text.TextUtils;
 
@@ -116,6 +118,10 @@
 
     @Override
     public void updateState(Preference preference) {
+        if (preference.isEnabled() && UserManager.get(mContext).hasBaseUserRestriction(
+                UserManager.DISALLOW_CONFIG_BRIGHTNESS, Process.myUserHandle())) {
+            preference.setEnabled(false);
+        }
         updatedSummary(preference);
     }