commit da6c1596fde6f691906eb8b980354ddc070b7fff
author Chong Zhang <chz@google.com> Tue Jul 16 13:45:06 2019 -0700
committer Chong Zhang <chz@google.com> Wed Jul 17 16:04:48 2019 -0700
tree 534732e48266e87e346733f5b44cc0b69f2d582f
parent cd92ac62e721f57b53270ac6691018e3b213202b

Allow AID_MEDIA to capture layer for video thumbnails

bug: 135717526
bug: 113609172
Change-Id: I7ab76f914e2f10c45aa25c7babc0a382f2d63597

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index f1e3971..fbe409f 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -5188,7 +5188,18 @@
         case SET_DISPLAY_BRIGHTNESS: {
             return OK;
         }
-        case CAPTURE_LAYERS:
+        case CAPTURE_LAYERS: {
+            IPCThreadState* ipc = IPCThreadState::self();
+            const int pid = ipc->getCallingPid();
+            const int uid = ipc->getCallingUid();
+            // allow media to capture layer for video thumbnails
+            if ((uid != AID_GRAPHICS && uid != AID_MEDIA) &&
+                !PermissionCache::checkPermission(sReadFramebuffer, pid, uid)) {
+                ALOGE("Permission Denial: can't capture layer pid=%d, uid=%d", pid, uid);
+                return PERMISSION_DENIED;
+            }
+            return OK;
+        }
         case CAPTURE_SCREEN:
         case ADD_REGION_SAMPLING_LISTENER:
         case REMOVE_REGION_SAMPLING_LISTENER: {