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

Commit c621ccd8 authored by Austin Borger's avatar Austin Borger Committed by Automerger Merge Worker
Browse files

Merge "Add new onUidProcAdjChanged callback to be consumed by the camera... 

Merge "Add new onUidProcAdjChanged callback to be consumed by the camera service." into tm-dev am: 1f692ead

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/16994303



Change-Id: I30a5fe6066f77a105213e857a514fd9b246fd36c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents baa2f357 1f692ead

libs/binder/IUidObserver.cpp

+16 −2
Original line number Original line Diff line number Diff line
@@ -57,8 +57,7 @@ public: 
    }

    }





    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)

                                   int32_t capability) {

    {

        Parcel data, reply;

        Parcel data, reply;

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

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

        data.writeInt32((int32_t) uid);

        data.writeInt32((int32_t) uid);
@@ -67,6 +66,12 @@ public: 
        data.writeInt32(capability);

        data.writeInt32(capability);

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

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

    }

    }



    virtual void onUidProcAdjChanged(uid_t uid) {

        Parcel data, reply;

        data.writeInt32((int32_t)uid);

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

    }

};

};





// ----------------------------------------------------------------------

// ----------------------------------------------------------------------
@@ -102,6 +107,7 @@ status_t BnUidObserver::onTransact( 
            onUidIdle(uid, disabled);

            onUidIdle(uid, disabled);

            return NO_ERROR;

            return NO_ERROR;

        } break;

        } break;



        case ON_UID_STATE_CHANGED_TRANSACTION: {

        case ON_UID_STATE_CHANGED_TRANSACTION: {

            CHECK_INTERFACE(IUidObserver, data, reply);

            CHECK_INTERFACE(IUidObserver, data, reply);

            uid_t uid = data.readInt32();

            uid_t uid = data.readInt32();
@@ -111,6 +117,14 @@ status_t BnUidObserver::onTransact( 
            onUidStateChanged(uid, procState, procStateSeq, capability);

            onUidStateChanged(uid, procState, procStateSeq, capability);

            return NO_ERROR;

            return NO_ERROR;

        } break;

        } break;



        case ON_UID_PROC_ADJ_CHANGED_TRANSACTION: {

            CHECK_INTERFACE(IUidObserver, data, reply);

            uid_t uid = data.readInt32();

            onUidProcAdjChanged(uid);

            return NO_ERROR;

        } break;



        default:

        default:

            return BBinder::onTransact(code, data, reply, flags);

            return BBinder::onTransact(code, data, reply, flags);

    }

    }

libs/binder/include_activitymanager/binder/ActivityManager.h

+8 −7
Original line number Original line Diff line number Diff line
@@ -31,7 +31,6 @@ namespace android { 
class ActivityManager

class ActivityManager

{

{

public:

public:



    enum {

    enum {

        // Flag for registerUidObserver: report uid state changed

        // Flag for registerUidObserver: report uid state changed

        UID_OBSERVER_PROCSTATE = 1 << 0,

        UID_OBSERVER_PROCSTATE = 1 << 0,
@@ -45,6 +44,8 @@ public: 
        UID_OBSERVER_CACHED = 1 << 4,

        UID_OBSERVER_CACHED = 1 << 4,

        // Flag for registerUidObserver: report uid capability has changed

        // Flag for registerUidObserver: report uid capability has changed

        UID_OBSERVER_CAPABILITY = 1 << 5,

        UID_OBSERVER_CAPABILITY = 1 << 5,

        // Flag for registerUidObserver: report pid oom adj has changed

        UID_OBSERVER_PROC_OOM_ADJ = 1 << 6,

    };

    };





    // PROCESS_STATE_* must come from frameworks/base/core/java/android/app/ProcessStateEnum.aidl.

    // PROCESS_STATE_* must come from frameworks/base/core/java/android/app/ProcessStateEnum.aidl.

libs/binder/include_activitymanager/binder/IUidObserver.h

+4 −2
Original line number Original line Diff line number Diff line
@@ -34,12 +34,14 @@ public: 
    virtual void onUidIdle(uid_t uid, bool disabled) = 0;

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

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

                                   int32_t capability) = 0;

    virtual void onUidProcAdjChanged(uid_t uid) = 0;





    enum {

    enum {

        ON_UID_GONE_TRANSACTION = IBinder::FIRST_CALL_TRANSACTION,

        ON_UID_GONE_TRANSACTION = IBinder::FIRST_CALL_TRANSACTION,

        ON_UID_ACTIVE_TRANSACTION,

        ON_UID_ACTIVE_TRANSACTION,

        ON_UID_IDLE_TRANSACTION,

        ON_UID_IDLE_TRANSACTION,

        ON_UID_STATE_CHANGED_TRANSACTION

        ON_UID_STATE_CHANGED_TRANSACTION,

        ON_UID_PROC_ADJ_CHANGED_TRANSACTION

    };

    };

};

};

services/sensorservice/SensorService.h

+6 −4
Original line number Original line Diff line number Diff line
@@ -257,11 +257,13 @@ private: 




            bool isUidActive(uid_t uid);

            bool isUidActive(uid_t uid);





            void onUidGone(uid_t uid, bool disabled);

            void onUidGone(uid_t uid, bool disabled) override;

            void onUidActive(uid_t uid);

            void onUidActive(uid_t uid) override;

            void onUidIdle(uid_t uid, bool disabled);

            void onUidIdle(uid_t uid, bool disabled) override;

            void onUidStateChanged(uid_t uid __unused, int32_t procState __unused,

            void onUidStateChanged(uid_t uid __unused, int32_t procState __unused,

                                   int64_t procStateSeq __unused, int32_t capability __unused) {}

                                   int64_t procStateSeq __unused,

                                   int32_t capability __unused) override {}

            void onUidProcAdjChanged(uid_t uid __unused) override {}





            void addOverrideUid(uid_t uid, bool active);

            void addOverrideUid(uid_t uid, bool active);

            void removeOverrideUid(uid_t uid);

            void removeOverrideUid(uid_t uid);