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

Commit c6a96aa7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "ActivityManager: return status for register/unregisterUidObserver"

parents 7752fe5b 1576534b

libs/binder/ActivityManager.cpp

+8 −4
Original line number Diff line number Diff line
@@ -62,23 +62,27 @@ int ActivityManager::openContentUri(const String16& stringUri) 
    return service != nullptr ? service->openContentUri(stringUri) : -1;

}



void ActivityManager::registerUidObserver(const sp<IUidObserver>& observer,

status_t ActivityManager::registerUidObserver(const sp<IUidObserver>& observer,

                                          const int32_t event,

                                          const int32_t cutpoint,

                                          const String16& callingPackage)

{

    sp<IActivityManager> service = getService();

    if (service != nullptr) {

        service->registerUidObserver(observer, event, cutpoint, callingPackage);

        return service->registerUidObserver(observer, event, cutpoint, callingPackage);

    }

    // ActivityManagerService appears dead. Return usual error code for dead service.

    return DEAD_OBJECT;

}



void ActivityManager::unregisterUidObserver(const sp<IUidObserver>& observer)

status_t ActivityManager::unregisterUidObserver(const sp<IUidObserver>& observer)

{

    sp<IActivityManager> service = getService();

    if (service != nullptr) {

        service->unregisterUidObserver(observer);

        return 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)

libs/binder/IActivityManager.cpp

+12 −4
Original line number Diff line number Diff line
@@ -59,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)
@@ -70,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)

libs/binder/include/binder/ActivityManager.h

+2 −2
Original line number Diff line number Diff line
@@ -74,11 +74,11 @@ public: 
    ActivityManager();



    int openContentUri(const String16& stringUri);

    void registerUidObserver(const sp<IUidObserver>& observer,

    status_t registerUidObserver(const sp<IUidObserver>& observer,

                             const int32_t event,

                             const int32_t cutpoint,

                             const String16& callingPackage);

    void unregisterUidObserver(const sp<IUidObserver>& observer);

    status_t unregisterUidObserver(const sp<IUidObserver>& observer);

    bool isUidActive(const uid_t uid, const String16& callingPackage);

    int getUidProcessState(const uid_t uid, const String16& callingPackage);

    status_t checkPermission(const String16& permission, const pid_t pid, const uid_t uid, int32_t* outResult);

libs/binder/include/binder/IActivityManager.h

+2 −2
Original line number Diff line number Diff line
@@ -31,11 +31,11 @@ public: 
    DECLARE_META_INTERFACE(ActivityManager)



    virtual int openContentUri(const String16& stringUri) = 0;

    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) = 0;

    virtual void unregisterUidObserver(const sp<IUidObserver>& observer) = 0;

    virtual status_t unregisterUidObserver(const sp<IUidObserver>& observer) = 0;

    virtual bool isUidActive(const uid_t uid, const String16& callingPackage) = 0;

    virtual int32_t getUidProcessState(const uid_t uid, const String16& callingPackage) = 0;

    virtual status_t checkPermission(const String16& permission,