From 7465e27d85709301b1b15d899527c121351a3f49 Mon Sep 17 00:00:00 2001
From: tomhsu <tomhsu@google.com>
Date: Fri, 22 Mar 2024 11:45:44 +0000
Subject: [PATCH] Enforce BaseUserRestriction for DISALLOW_CONFIG_BRIGHTNESS

 - For Adaptive brightness

Fix: 330855652
Test: Manual test. see b/330855652
Change-Id: Iea848c9d92abdf152d3eb827fbe1fb141f4687d7
---
 res/xml/display_settings.xml                    |  5 ++++-
 .../AutoBrightnessPreferenceController.java     | 17 ++++++++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index 5b4bee8ebb5..35ae6fb5ae5 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -35,7 +35,10 @@
             android:key="auto_brightness_entry"
             android:title="@string/auto_brightness_title"
             android:fragment="com.android.settings.display.AutoBrightnessSettings"
-            settings:controller="com.android.settings.display.AutoBrightnessPreferenceController"/>
+            settings:useAdminDisabledSummary="true"
+            settings:userRestriction="no_config_brightness"
+            settings:controller="com.android.settings.display.AutoBrightnessPreferenceController" />
+
         <SwitchPreferenceCompat
             android:key="even_dimmer_activated"
             android:title="@string/even_dimmer_display_title"
diff --git a/src/com/android/settings/display/AutoBrightnessPreferenceController.java b/src/com/android/settings/display/AutoBrightnessPreferenceController.java
index d925de3959d..bf211837e69 100644
--- a/src/com/android/settings/display/AutoBrightnessPreferenceController.java
+++ b/src/com/android/settings/display/AutoBrightnessPreferenceController.java
@@ -18,11 +18,15 @@ import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC;
 import static android.provider.Settings.System.SCREEN_BRIGHTNESS_MODE_MANUAL;
 
 import android.content.Context;
+import android.os.Process;
+import android.os.UserManager;
 import android.provider.Settings;
 
+import androidx.preference.Preference;
+
 import com.android.settings.R;
 import com.android.settings.core.TogglePreferenceController;
-
+import com.android.settingslib.PrimarySwitchPreference;
 
 public class AutoBrightnessPreferenceController extends TogglePreferenceController {
 
@@ -55,6 +59,17 @@ public class AutoBrightnessPreferenceController extends TogglePreferenceControll
                 : UNSUPPORTED_ON_DEVICE;
     }
 
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+        PrimarySwitchPreference pref = (PrimarySwitchPreference) preference;
+        if (pref.isEnabled() && UserManager.get(mContext).hasBaseUserRestriction(
+                UserManager.DISALLOW_CONFIG_BRIGHTNESS, Process.myUserHandle())) {
+            pref.setEnabled(false);
+            pref.setSwitchEnabled(false);
+        }
+    }
+
     @Override
     public CharSequence getSummary() {
         return mContext.getText(isChecked()