Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 794e76db authored by Chaohui Wang's avatar Chaohui Wang Committed by Android (Google) Code Review
Browse files

Merge "Enforce BaseUserRestriction for DISALLOW_CONFIG_BRIGHTNESS" into main

parents 52d345f5 8265c6b7

packages/SystemUI/aconfig/systemui.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -814,3 +814,10 @@ flag { 
        purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "enforce_brightness_base_user_restriction"

    namespace: "systemui"

    description: "Enforce BaseUserRestriction for DISALLOW_CONFIG_BRIGHTNESS."

    bug: "329205638"

}

packages/SystemUI/src/com/android/systemui/settings/brightness/BrightnessController.java

+12 −2
Original line number Diff line number Diff line
@@ -47,7 +47,9 @@ import androidx.annotation.Nullable; 
import com.android.internal.display.BrightnessSynchronizer;

import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.settingslib.RestrictedLockUtils;

import com.android.settingslib.RestrictedLockUtilsInternal;

import com.android.systemui.Flags;

import com.android.systemui.dagger.qualifiers.Background;

import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.settings.DisplayTracker;
@@ -370,10 +372,18 @@ public class BrightnessController implements ToggleSlider.Listener, MirroredBrig 
        mBackgroundHandler.post(new Runnable() {

            @Override

            public void run() {

                mControl.setEnforcedAdmin(

                int userId = mUserTracker.getUserId();

                RestrictedLockUtils.EnforcedAdmin enforcedAdmin =

                        RestrictedLockUtilsInternal.checkIfRestrictionEnforced(mContext,

                                UserManager.DISALLOW_CONFIG_BRIGHTNESS,

                                mUserTracker.getUserId()));

                                userId);

                if (Flags.enforceBrightnessBaseUserRestriction() && enforcedAdmin == null

                        && RestrictedLockUtilsInternal.hasBaseUserRestriction(mContext,

                        UserManager.DISALLOW_CONFIG_BRIGHTNESS,

                        userId)) {

                    enforcedAdmin = new RestrictedLockUtils.EnforcedAdmin();

                }

                mControl.setEnforcedAdmin(enforcedAdmin);

            }

        });

    }