From be49e61d0f9d666b7e598a72999f3870fffd83f0 Mon Sep 17 00:00:00 2001 From: Chaohui Wang Date: Tue, 12 Mar 2024 18:30:52 +0800 Subject: [PATCH] Enforce BaseUserRestriction for DISALLOW_CONFIG_BRIGHTNESS Fix: 329205638 Test: pm set-user-restriction --user 0 no_config_brightness 1 Change-Id: Icacf051789ea40d23cd29c16168fbeb204cf8f5b --- .../display/BrightnessLevelPreferenceController.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/com/android/settings/display/BrightnessLevelPreferenceController.java b/src/com/android/settings/display/BrightnessLevelPreferenceController.java index ac1a1cbf12a..468a1d8dd7f 100644 --- a/src/com/android/settings/display/BrightnessLevelPreferenceController.java +++ b/src/com/android/settings/display/BrightnessLevelPreferenceController.java @@ -31,6 +31,8 @@ import android.hardware.display.DisplayManager.DisplayListener; 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 @@ public class BrightnessLevelPreferenceController extends AbstractPreferenceContr @Override public void updateState(Preference preference) { + if (preference.isEnabled() && UserManager.get(mContext).hasBaseUserRestriction( + UserManager.DISALLOW_CONFIG_BRIGHTNESS, Process.myUserHandle())) { + preference.setEnabled(false); + } updatedSummary(preference); }