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

Commit 6d2dc42b authored by Hui Yu's avatar Hui Yu Committed by Android (Google) Code Review
Browse files

Merge "Add new parameter capability to onUidStateChanged()"

parents 6a1f9276 ee03b787

libs/binder/IUidObserver.cpp

+5 −2
Original line number Diff line number Diff line
@@ -56,13 +56,15 @@ public: 
        remote()->transact(ON_UID_IDLE_TRANSACTION, data, &reply, IBinder::FLAG_ONEWAY);

    }



    virtual void onUidStateChanged(uid_t uid, int32_t procState, int64_t procStateSeq)

    virtual void onUidStateChanged(uid_t uid, int32_t procState, int64_t procStateSeq,

            int32_t capability)

    {

        Parcel data, reply;

        data.writeInterfaceToken(IUidObserver::getInterfaceDescriptor());

        data.writeInt32((int32_t) uid);

        data.writeInt32(procState);

        data.writeInt64(procStateSeq);

        data.writeInt32(capability);

        remote()->transact(ON_UID_STATE_CHANGED_TRANSACTION, data, &reply, IBinder::FLAG_ONEWAY);

    }

};
@@ -104,7 +106,8 @@ status_t BnUidObserver::onTransact( 
            uid_t uid = data.readInt32();

            int32_t procState = data.readInt32();

            int64_t procStateSeq = data.readInt64();

            onUidStateChanged(uid, procState, procStateSeq);

            int32_t capability = data.readInt32();

            onUidStateChanged(uid, procState, procStateSeq, capability);

            return NO_ERROR;

        } break;

        default:

libs/binder/include/binder/IUidObserver.h

+2 −1
Original line number Diff line number Diff line
@@ -34,7 +34,8 @@ public: 
    virtual void onUidGone(uid_t uid, bool disabled) = 0;

    virtual void onUidActive(uid_t uid) = 0;

    virtual void onUidIdle(uid_t uid, bool disabled) = 0;

    virtual void onUidStateChanged(uid_t uid, int32_t procState, int64_t procStateSeq) = 0;

    virtual void onUidStateChanged(uid_t uid, int32_t procState, int64_t procStateSeq,

            int32_t capability) = 0;



    enum {

        ON_UID_GONE_TRANSACTION = IBinder::FIRST_CALL_TRANSACTION,

services/sensorservice/SensorService.h

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ private: 
            void onUidActive(uid_t uid);

            void onUidIdle(uid_t uid, bool disabled);

            void onUidStateChanged(uid_t uid __unused, int32_t procState __unused,

                                   int64_t procStateSeq __unused) {}

                                   int64_t procStateSeq __unused, int32_t capability __unused) {}



            void addOverrideUid(uid_t uid, bool active);

            void removeOverrideUid(uid_t uid);