diff options
Diffstat (limited to 'libs/binder/IActivityManager.cpp')
| -rw-r--r-- | libs/binder/IActivityManager.cpp | 37 |
1 files changed, 32 insertions, 5 deletions
diff --git a/libs/binder/IActivityManager.cpp b/libs/binder/IActivityManager.cpp index 1eb5363ae2..08169f5538 100644 --- a/libs/binder/IActivityManager.cpp +++ b/libs/binder/IActivityManager.cpp @@ -17,9 +17,11 @@ #include <unistd.h> #include <fcntl.h> +#include <android/permission_manager.h> #include <binder/ActivityManager.h> #include <binder/IActivityManager.h> #include <binder/Parcel.h> +#include <utils/Errors.h> namespace android { @@ -57,7 +59,7 @@ public: return fd; } - virtual void registerUidObserver(const sp<IUidObserver>& observer, + virtual status_t registerUidObserver(const sp<IUidObserver>& observer, const int32_t event, const int32_t cutpoint, const String16& callingPackage) @@ -68,15 +70,23 @@ public: data.writeInt32(event); data.writeInt32(cutpoint); data.writeString16(callingPackage); - remote()->transact(REGISTER_UID_OBSERVER_TRANSACTION, data, &reply); + status_t err = remote()->transact(REGISTER_UID_OBSERVER_TRANSACTION, data, &reply); + if (err != NO_ERROR || ((err = reply.readExceptionCode()) != NO_ERROR)) { + return err; + } + return OK; } - virtual void unregisterUidObserver(const sp<IUidObserver>& observer) + virtual status_t unregisterUidObserver(const sp<IUidObserver>& observer) { Parcel data, reply; data.writeInterfaceToken(IActivityManager::getInterfaceDescriptor()); data.writeStrongBinder(IInterface::asBinder(observer)); - remote()->transact(UNREGISTER_UID_OBSERVER_TRANSACTION, data, &reply); + status_t err = remote()->transact(UNREGISTER_UID_OBSERVER_TRANSACTION, data, &reply); + if (err != NO_ERROR || ((err = reply.readExceptionCode()) != NO_ERROR)) { + return err; + } + return OK; } virtual bool isUidActive(const uid_t uid, const String16& callingPackage) @@ -104,10 +114,27 @@ public: } return reply.readInt32(); } + + virtual status_t checkPermission(const String16& permission, + const pid_t pid, + const uid_t uid, + int32_t* outResult) { + Parcel data, reply; + data.writeInterfaceToken(IActivityManager::getInterfaceDescriptor()); + data.writeString16(permission); + data.writeInt32(pid); + data.writeInt32(uid); + status_t err = remote()->transact(CHECK_PERMISSION_TRANSACTION, data, &reply); + if (err != NO_ERROR || ((err = reply.readExceptionCode()) != NO_ERROR)) { + return err; + } + *outResult = reply.readInt32(); + return NO_ERROR; + } }; // ------------------------------------------------------------------------------------ -IMPLEMENT_META_INTERFACE(ActivityManager, "android.app.IActivityManager"); +IMPLEMENT_META_INTERFACE(ActivityManager, "android.app.IActivityManager") } // namespace android |