commit cf7a7b25c70e410791d6182e579f6db2eeb3556b
author Leon Scroggins III <scroggo@google.com> Thu Dec 23 20:04:48 2021 -0500
committer Leon Scroggins III <scroggo@google.com> Tue Dec 28 11:05:23 2021 -0500
tree 2d865768ab77ac7a886ab77fdb0bec38b85e141b
parent 7fd536f37d0d64aed8981feabaad45856bddab52

Treat AID_GRAPHICS and AID_SYSTEM as having InternalSystemWindowAccess

Without this check, some devices hit a deadlock in the permission cache.

Bug: 212402133
Bug: 211797674
Bug: 211835607
Test: manual
Change-Id: Ib11d46439db57b90486bad07dd90f2cf0822182a

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 4d7e4d9..8046798 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -364,7 +364,8 @@
     IPCThreadState* ipc = IPCThreadState::self();
     const int pid = ipc->getCallingPid();
     const int uid = ipc->getCallingUid();
-    return PermissionCache::checkPermission(sInternalSystemWindow, pid, uid);
+    return uid == AID_GRAPHICS || uid == AID_SYSTEM ||
+        PermissionCache::checkPermission(sInternalSystemWindow, pid, uid);
 }
 
 SurfaceFlinger::SurfaceFlinger(Factory& factory, SkipInitializationTag)