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

Commit e71575be authored by Marco Nelissen's avatar Marco Nelissen Committed by Android Git Automerger
Browse files

am 48d3741b: Merge "Allow blaming a single uid for work done" into klp-dev 

* commit '48d3741b':
  Allow blaming a single uid for work done
parents 04e6ab6e 48d3741b

include/powermanager/IPowerManager.h

+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ public: 


    virtual status_t acquireWakeLock(int flags, const sp<IBinder>& lock, const String16& tag,

            const String16& packageName) = 0;

    virtual status_t acquireWakeLockWithUid(int flags, const sp<IBinder>& lock, const String16& tag,

            const String16& packageName, int uid) = 0;

    virtual status_t releaseWakeLock(const sp<IBinder>& lock, int flags) = 0;

};

services/powermanager/IPowerManager.cpp

+16 −1
Original line number Diff line number Diff line
@@ -30,7 +30,8 @@ namespace android { 
// must be kept in sync with IPowerManager.aidl

enum {

    ACQUIRE_WAKE_LOCK = IBinder::FIRST_CALL_TRANSACTION,

    RELEASE_WAKE_LOCK = IBinder::FIRST_CALL_TRANSACTION + 1,

    ACQUIRE_WAKE_LOCK_UID = IBinder::FIRST_CALL_TRANSACTION + 1,

    RELEASE_WAKE_LOCK = IBinder::FIRST_CALL_TRANSACTION + 2,

};



class BpPowerManager : public BpInterface<IPowerManager>
@@ -55,6 +56,20 @@ public: 
        return remote()->transact(ACQUIRE_WAKE_LOCK, data, &reply);

    }



    virtual status_t acquireWakeLockWithUid(int flags, const sp<IBinder>& lock, const String16& tag,

            const String16& packageName, int uid)

    {

        Parcel data, reply;

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



        data.writeStrongBinder(lock);

        data.writeInt32(flags);

        data.writeString16(tag);

        data.writeString16(packageName);

        data.writeInt32(uid); // uid to blame for the work

        return remote()->transact(ACQUIRE_WAKE_LOCK_UID, data, &reply);

    }



    virtual status_t releaseWakeLock(const sp<IBinder>& lock, int flags)

    {

        Parcel data, reply;