commit 378053760f1d45e5a1767a7cbbb2b1183e3c0662
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Jun 05 22:34:12 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 05 22:34:13 2017 +0000
tree b78151a16a2e0753af51e47ef095641976000681
parent 537b16c4010e6c7b08500568403b2a09c34e876c
parent 8c6bbd63d8bb06197c671690268c49d20949d8cc

Merge "Let the system process set the saturation boost"

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index edc0140..78579a5 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -3846,10 +3846,11 @@
     status_t err = BnSurfaceComposer::onTransact(code, data, reply, flags);
     if (err == UNKNOWN_TRANSACTION || err == PERMISSION_DENIED) {
         CHECK_INTERFACE(ISurfaceComposer, data, reply);
-        if (CC_UNLIKELY(!PermissionCache::checkCallingPermission(sHardwareTest))) {
-            IPCThreadState* ipc = IPCThreadState::self();
+        IPCThreadState* ipc = IPCThreadState::self();
+        const int uid = ipc->getCallingUid();
+        if (CC_UNLIKELY(uid != AID_SYSTEM
+                && !PermissionCache::checkCallingPermission(sHardwareTest))) {
             const int pid = ipc->getCallingPid();
-            const int uid = ipc->getCallingUid();
             ALOGE("Permission Denial: "
                     "can't access SurfaceFlinger pid=%d, uid=%d", pid, uid);
             return PERMISSION_DENIED;