| commit | ea28fbe0035b892e52e646c33d4396dad33201ca | [log] [tgz] |
|---|---|---|
| author | Haamed Gheibi <haamed@google.com> | Wed Oct 19 22:18:05 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Oct 19 22:18:05 2022 +0000 |
| tree | 9305324638e302c9113095277c3ffba864106666 | |
| parent | f758f7a49ba3aa29f9d5fcb11aae9f6f0811646a [diff] | |
| parent | c8c9bc3c84c630fd08dfbd2058da67e16bf41b36 [diff] |
Merge "sf: Allow SystemServer to set the display brightness" am: 9861ecb7c8 am: 22cf144ad3 am: c8c9bc3c84 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2259832 Change-Id: Ief248ec12594a888f4e5062cc66aa272754fc4b7 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 f3148cb..6cd57c4 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -7764,7 +7764,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;