diff options
| author | 2016-04-14 17:10:50 +0000 | |
|---|---|---|
| committer | 2016-04-14 17:10:50 +0000 | |
| commit | a7ba9d0abc640e28874b2bc3a2c184603cb91167 (patch) | |
| tree | 099332117326d093d2990037eddc0014601d70b6 | |
| parent | e2e44ddc6b0830d03f55e1388c96ef66d1d00ed2 (diff) | |
| parent | 8282342215156d77d27fdf10c34a982bf54e66bf (diff) | |
Merge "Run 'nativeperms', remove Brillo #ifdef."
| -rw-r--r-- | libs/binder/IServiceManager.cpp | 5 | ||||
| -rw-r--r-- | services/nativeperms/Android.mk | 3 |
2 files changed, 1 insertions, 7 deletions
diff --git a/libs/binder/IServiceManager.cpp b/libs/binder/IServiceManager.cpp index 61f24d6805..725ebdf95f 100644 --- a/libs/binder/IServiceManager.cpp +++ b/libs/binder/IServiceManager.cpp @@ -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; diff --git a/services/nativeperms/Android.mk b/services/nativeperms/Android.mk index 6cde63acf3..34ccd0bf79 100644 --- a/services/nativeperms/Android.mk +++ b/services/nativeperms/Android.mk @@ -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) |