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

Commit 15358d50 authored by Fiona Campbell's avatar Fiona Campbell
Browse files

Make setBrightnessConfigurationForUser locked 

Ensure that locked methods aren't being called outside the correct lock.

Test: manual
Bug: 200656677

Change-Id: Idca0a3b3e3480b51d8e421ab4972547f9b16c5d5
parent 4650065c

services/core/java/com/android/server/display/DisplayManagerService.java

+24 −7
Original line number Diff line number Diff line
@@ -2863,15 +2863,32 @@ public final class DisplayManagerService extends SystemService { 
        @Override // Binder call

        public void setBrightnessConfigurationForUser(

                BrightnessConfiguration c, @UserIdInt int userId, String packageName) {

            mContext.enforceCallingOrSelfPermission(

                    Manifest.permission.CONFIGURE_DISPLAY_BRIGHTNESS,

                    "Permission required to change the display's brightness configuration");

            if (userId != UserHandle.getCallingUserId()) {

                mContext.enforceCallingOrSelfPermission(

                        Manifest.permission.INTERACT_ACROSS_USERS,

                        "Permission required to change the display brightness"

                                + " configuration of another user");

            }

            final long token = Binder.clearCallingIdentity();

            try {

                synchronized (mSyncRoot) {

                    mLogicalDisplayMapper.forEachLocked(logicalDisplay -> {

                        if (logicalDisplay.getDisplayInfoLocked().type != Display.TYPE_INTERNAL) {

                            return;

                        }

                final DisplayDevice displayDevice = logicalDisplay.getPrimaryDisplayDeviceLocked();

                setBrightnessConfigurationForDisplay(c, displayDevice.getUniqueId(), userId,

                        packageName);

                        final DisplayDevice displayDevice =

                                logicalDisplay.getPrimaryDisplayDeviceLocked();

                        setBrightnessConfigurationForDisplayInternal(c, displayDevice.getUniqueId(),

                                userId, packageName);

                    });

                }

            } finally {

                Binder.restoreCallingIdentity(token);

            }

        }



        @Override // Binder call

        public void setBrightnessConfigurationForDisplay(BrightnessConfiguration c,