| commit | c8c9bc3c84c630fd08dfbd2058da67e16bf41b36 | [log] [tgz] |
|---|---|---|
| author | Haamed Gheibi <haamed@google.com> | Wed Oct 19 21:45:09 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Oct 19 21:45:09 2022 +0000 |
| tree | 906cf44a9bd8cb775f64367bed55dc243bff17cb | |
| parent | b3d421769d3d663703cc1251f845e3949e678211 [diff] | |
| parent | 22cf144ad3717e18ee668a0d2b5ab44ea32332e6 [diff] |
Merge "sf: Allow SystemServer to set the display brightness" am: 9861ecb7c8 am: 22cf144ad3 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2259832 Change-Id: Ibfb327bbbfec0c32c836ca73c695bc8559417fab Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index f147991..7e34219 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -7599,7 +7599,7 @@ IPCThreadState* ipc = IPCThreadState::self(); const int pid = ipc->getCallingPid(); const int uid = ipc->getCallingUid(); - if ((uid != AID_GRAPHICS) && + if ((uid != AID_GRAPHICS) && (uid != AID_SYSTEM) && !PermissionCache::checkPermission(sControlDisplayBrightness, pid, uid)) { ALOGE("Permission Denial: can't control brightness pid=%d, uid=%d", pid, uid); return PERMISSION_DENIED;