Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make setBrightnessConfigurationForUser locked

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

Test: manual
Bug: 200656677

Change-Id: Idca0a3b3e3480b51d8e421ab4972547f9b16c5d5
This commit is contained in:
Fiona Campbell
2021-09-30 11:26:42 +00:00
parent 4650065c80
commit 15358d50ea
1 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
services/core/java/com/android/server/display/DisplayManagerService.java
View File

@@ -2863,14 +2863,31 @@ public final class DisplayManagerService extends SystemService {
@Override // Binder call
public void setBrightnessConfigurationForUser(
BrightnessConfiguration c, @UserIdInt int userId, String packageName) {
mLogicalDisplayMapper.forEachLocked(logicalDisplay -> {
if (logicalDisplay.getDisplayInfoLocked().type != Display.TYPE_INTERNAL) {
return;
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();
setBrightnessConfigurationForDisplayInternal(c, displayDevice.getUniqueId(),
userId, packageName);
});
}
final DisplayDevice displayDevice = logicalDisplay.getPrimaryDisplayDeviceLocked();
setBrightnessConfigurationForDisplay(c, displayDevice.getUniqueId(), userId,
packageName);
});
} finally {
Binder.restoreCallingIdentity(token);
}
}
@Override // Binder call