Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit adb3aff0 authored by Dan Stoza's avatar Dan Stoza Committed by Android Git Automerger
Browse files

am 5566d9db: Merge "Bypass surface flinger permission check for calls from system." 

* commit '5566d9db':
  Bypass surface flinger permission check for calls from system.
parents 84a507ae 5566d9db

services/surfaceflinger/Client.cpp

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ status_t Client::onTransact( 
     const int pid = ipc->getCallingPid();

     const int uid = ipc->getCallingUid();

     const int self_pid = getpid();

     if (CC_UNLIKELY(pid != self_pid && uid != AID_GRAPHICS && uid != 0)) {

     if (CC_UNLIKELY(pid != self_pid && uid != AID_GRAPHICS && uid != AID_SYSTEM && uid != 0)) {

         // we're called from a different process, do the real check

         if (!PermissionCache::checkCallingPermission(sAccessSurfaceFlinger))

         {

services/surfaceflinger/SurfaceFlinger.cpp

+1 −1
Original line number Diff line number Diff line
@@ -2807,7 +2807,7 @@ status_t SurfaceFlinger::onTransact( 
            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(sAccessSurfaceFlinger, pid, uid)) {

                ALOGE("Permission Denial: "

                        "can't access SurfaceFlinger pid=%d, uid=%d", pid, uid);