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

Merge "Make setBrightnessConfigurationForUser locked" into sc-v2-dev am: c19c6d4b3c

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15949362

Change-Id: Id404fc7aa4bcd32fe49363fad074953997fb66a9
This commit is contained in:
Fiona Campbell
2021-11-12 17:27:40 +00:00
committed by Automerger Merge Worker
parent eb85b9efdb c19c6d4b3c
commit 5c782095fd
1 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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