commit d1690d1e86fb6ac854c95e5f599270048bb5527c
author Chong Zhang <chz@google.com> Fri Oct 04 17:47:13 2019 +0000
committer Chong Zhang <chz@google.com> Fri Oct 04 17:48:46 2019 +0000
tree 32381cb0f3991a020c0c2f7e2b023d94c865879c
parent da6c1596fde6f691906eb8b980354ddc070b7fff

Revert "Allow AID_MEDIA to capture layer for video thumbnails"

This reverts commit da6c1596fde6f691906eb8b980354ddc070b7fff.

Reason for revert: since we're reworking the solution to move
the use of renderengine to mediaserver side, this permission
is no longer needed.

bug: 140894732
bug: 135717526
Change-Id: Ib3b313c2673e9d5a26104f0719cc81f9632ed934

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index fbe409f..f1e3971 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -5188,18 +5188,7 @@
         case SET_DISPLAY_BRIGHTNESS: {
             return OK;
         }
-        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_LAYERS:
         case CAPTURE_SCREEN:
         case ADD_REGION_SAMPLING_LISTENER:
         case REMOVE_REGION_SAMPLING_LISTENER: {