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

Commit ce0f028e authored by Daniel Erat's avatar Daniel Erat Committed by android-build-merger
Browse files

Merge "libbinder: Stub out checkPermissions() on Brillo." am: 0d6d2917 

am: 0923d101

* commit '0923d101':
  libbinder: Stub out checkPermissions() on Brillo.
parents b73f66ec 0923d101

libs/binder/IServiceManager.cpp

+12 −7
Original line number Diff line number Diff line
@@ -67,6 +67,11 @@ bool checkCallingPermission(const String16& permission, int32_t* outPid, int32_t 


bool checkPermission(const String16& permission, pid_t pid, uid_t uid)

{

#ifdef __BRILLO__

    // Brillo doesn't currently run ActivityManager or support framework permissions.

    return true;

#endif



    sp<IPermissionController> pc;

    gDefaultServiceManagerLock.lock();

    pc = gPermissionController;