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

Commit 13ad0eb5 authored by Hui Yu's avatar Hui Yu
Browse files

Add new parameter capability to onUidStateChanged() 

Bug: 136274596
Test: NA.
Change-Id: I40868ec27bd34cf91549ce9a28d1683c31558942
parent 6d0d5150

services/audiopolicy/service/AudioPolicyService.cpp

+2 −1
Original line number Diff line number Diff line
@@ -928,7 +928,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
@@ -2722,7 +2722,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
@@ -548,7 +548,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);