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

Commit 180cce95 authored by Jorge Lucangeli Obes's avatar Jorge Lucangeli Obes Committed by android-build-merger
Browse files

Merge "Run \'nativeperms\', remove Brillo #ifdef." am: a7ba9d0a 

am: f949746c

* commit 'f949746c':
  Run 'nativeperms', remove Brillo #ifdef.

Change-Id: I97b63439e6ea55db2d5b7bde7cde514666e6d556
parents 83dd8e11 f949746c

libs/binder/IServiceManager.cpp

+0 −5
Original line number Diff line number Diff line
@@ -67,11 +67,6 @@ 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;

services/nativeperms/Android.mk

+1 −2
Original line number Diff line number Diff line
@@ -27,6 +27,5 @@ LOCAL_SHARED_LIBRARIES := \ 
    libbrillo-binder \

    libchrome \

    libutils

# Commented out momentarily until SELinux policies land in a different repo.

# LOCAL_INIT_RC := nativeperms.rc

LOCAL_INIT_RC := nativeperms.rc

include $(BUILD_EXECUTABLE)