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

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

Merge "Add new parameter capability to onUidStateChanged()"

parents 86a313bc 13ad0eb5

services/audiopolicy/service/AudioPolicyService.cpp

+2 −1
Original line number Diff line number Diff line
@@ -977,7 +977,8 @@ void AudioPolicyService::UidPolicy::onUidIdle(uid_t uid, __unused bool disabled) 


void AudioPolicyService::UidPolicy::onUidStateChanged(uid_t uid,

                                                      int32_t procState,

                                                      int64_t procStateSeq __unused) {

                                                      int64_t procStateSeq __unused,

                                                      int32_t capability __unused) {

    if (procState != ActivityManager::PROCESS_STATE_UNKNOWN) {

        updateUid(&mCachedUids, uid, true, procState, true);

    }

services/audiopolicy/service/AudioPolicyService.h

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

        void onUidGone(uid_t uid, bool disabled) override;

        void onUidIdle(uid_t uid, bool disabled) override;

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

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

                int32_t capability);



        void addOverrideUid(uid_t uid, bool active) { updateOverrideUid(uid, active, true); }

        void removeOverrideUid(uid_t uid) { updateOverrideUid(uid, false, false); }

services/camera/libcameraservice/CameraService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -2855,7 +2855,7 @@ void CameraService::UidPolicy::onUidIdle(uid_t uid, bool /* disabled */) { 
}



void CameraService::UidPolicy::onUidStateChanged(uid_t uid, int32_t procState,

        int64_t /*procStateSeq*/) {

        int64_t procStateSeq __unused, int32_t capability __unused) {

    bool procStateChange = false;

    {

        Mutex::Autolock _l(mUidLock);

services/camera/libcameraservice/CameraService.h

+2 −1
Original line number Diff line number Diff line
@@ -574,7 +574,8 @@ private: 
        void onUidGone(uid_t uid, bool disabled);

        void onUidActive(uid_t uid);

        void onUidIdle(uid_t uid, bool disabled);

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

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

                int32_t capability);



        void addOverrideUid(uid_t uid, String16 callingPackage, bool active);

        void removeOverrideUid(uid_t uid, String16 callingPackage);