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

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

Merge "UidObserver / Camera: Track the OOM adj of a uid via UidObserver." into... 

Merge "UidObserver / Camera: Track the OOM adj of a uid via UidObserver." into udc-dev am: 3b666b0b am: b9d97b76

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



Change-Id: Ibbc8f390a30de614f72f6ea5d444bf4f129cbeb0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a51f4dab b9d97b76

libs/binder/IUidObserver.cpp

+4 −2
Original line number Diff line number Diff line
@@ -67,9 +67,10 @@ public: 
        remote()->transact(ON_UID_STATE_CHANGED_TRANSACTION, data, &reply, IBinder::FLAG_ONEWAY);

    }



    virtual void onUidProcAdjChanged(uid_t uid) {

    virtual void onUidProcAdjChanged(uid_t uid, int32_t adj) {

        Parcel data, reply;

        data.writeInt32((int32_t)uid);

        data.writeInt32((int32_t)adj);

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

    }

};
@@ -121,7 +122,8 @@ status_t BnUidObserver::onTransact( 
        case ON_UID_PROC_ADJ_CHANGED_TRANSACTION: {

            CHECK_INTERFACE(IUidObserver, data, reply);

            uid_t uid = data.readInt32();

            onUidProcAdjChanged(uid);

            int32_t adj = data.readInt32();

            onUidProcAdjChanged(uid, adj);

            return NO_ERROR;

        } break;

libs/binder/include_activitymanager/binder/IUidObserver.h

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

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

                                   int32_t capability) = 0;

    virtual void onUidProcAdjChanged(uid_t uid) = 0;

    virtual void onUidProcAdjChanged(uid_t uid, int32_t adj) = 0;



    enum {

        ON_UID_GONE_TRANSACTION = IBinder::FIRST_CALL_TRANSACTION,

services/sensorservice/SensorService.h

+1 −1
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ private: 
            void onUidStateChanged(uid_t uid __unused, int32_t procState __unused,

                                   int64_t procStateSeq __unused,

                                   int32_t capability __unused) override {}

            void onUidProcAdjChanged(uid_t uid __unused) override {}

            void onUidProcAdjChanged(uid_t uid __unused, int32_t adj __unused) override {}



            void addOverrideUid(uid_t uid, bool active);

            void removeOverrideUid(uid_t uid);