Merge "Enforce BaseUserRestriction for DISALLOW_CONFIG_BRIGHTNESS" into main
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);
}