diff options
Diffstat (limited to 'libs/binder/ActivityManager.cpp')
| -rw-r--r-- | libs/binder/ActivityManager.cpp | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/libs/binder/ActivityManager.cpp b/libs/binder/ActivityManager.cpp index e45a656d29..5e4c98fc7a 100644 --- a/libs/binder/ActivityManager.cpp +++ b/libs/binder/ActivityManager.cpp @@ -17,7 +17,6 @@ #include <mutex> #include <unistd.h> -#include <android/permission_manager.h> #include <binder/ActivityManager.h> #include <binder/Binder.h> #include <binder/IServiceManager.h> @@ -62,27 +61,23 @@ int ActivityManager::openContentUri(const String16& stringUri) return service != nullptr ? service->openContentUri(stringUri) : -1; } -status_t ActivityManager::registerUidObserver(const sp<IUidObserver>& observer, +void ActivityManager::registerUidObserver(const sp<IUidObserver>& observer, const int32_t event, const int32_t cutpoint, const String16& callingPackage) { sp<IActivityManager> service = getService(); if (service != nullptr) { - return service->registerUidObserver(observer, event, cutpoint, callingPackage); + service->registerUidObserver(observer, event, cutpoint, callingPackage); } - // ActivityManagerService appears dead. Return usual error code for dead service. - return DEAD_OBJECT; } -status_t ActivityManager::unregisterUidObserver(const sp<IUidObserver>& observer) +void ActivityManager::unregisterUidObserver(const sp<IUidObserver>& observer) { sp<IActivityManager> service = getService(); if (service != nullptr) { - return service->unregisterUidObserver(observer); + service->unregisterUidObserver(observer); } - // ActivityManagerService appears dead. Return usual error code for dead service. - return DEAD_OBJECT; } bool ActivityManager::isUidActive(const uid_t uid, const String16& callingPackage) @@ -103,18 +98,6 @@ int32_t ActivityManager::getUidProcessState(const uid_t uid, const String16& cal return PROCESS_STATE_UNKNOWN; } -status_t ActivityManager::checkPermission(const String16& permission, - const pid_t pid, - const uid_t uid, - int32_t* outResult) { - sp<IActivityManager> service = getService(); - if (service != nullptr) { - return service->checkPermission(permission, pid, uid, outResult); - } - // ActivityManagerService appears dead. Return usual error code for dead service. - return DEAD_OBJECT; -} - status_t ActivityManager::linkToDeath(const sp<IBinder::DeathRecipient>& recipient) { sp<IActivityManager> service = getService(); if (service != nullptr) { |