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

Commit 2f34814d authored by Steven Moreland's avatar Steven Moreland
Browse files

Hold onto linked binder. 

unlinkToDeath is no longer required, (this change in behavior is to
avoid leaks) so holding onto ActivityManager here (still calling
unlinkToDeath to avoid a log, but may for instance remove all
unlinkToDeath calls in the future).

Exempt-From-Owner-Approval: approval received on AOSP CL, only
    whitespace difference here.

Bug: 134576445
Test: boot
Change-Id: I273f77aac2b80ba9be70197cc3842f83a11bbd1c
parent 964a7482

media/libstagefright/MediaCodecList.cpp

+4 −4
Original line number Diff line number Diff line
@@ -170,6 +170,7 @@ sp<IMediaCodecList> MediaCodecList::getLocalInstance() { 
sp<IMediaCodecList> MediaCodecList::sRemoteList;



sp<MediaCodecList::BinderDeathObserver> MediaCodecList::sBinderDeathObserver;

sp<IBinder> MediaCodecList::sMediaPlayer;  // kept since linked to death



void MediaCodecList::BinderDeathObserver::binderDied(const wp<IBinder> &who __unused) {

    Mutex::Autolock _l(sRemoteInitMutex);
@@ -181,15 +182,14 @@ void MediaCodecList::BinderDeathObserver::binderDied(const wp<IBinder> &who __un 
sp<IMediaCodecList> MediaCodecList::getInstance() {

    Mutex::Autolock _l(sRemoteInitMutex);

    if (sRemoteList == nullptr) {

        sp<IBinder> binder =

            defaultServiceManager()->getService(String16("media.player"));

        sMediaPlayer = defaultServiceManager()->getService(String16("media.player"));

        sp<IMediaPlayerService> service =

            interface_cast<IMediaPlayerService>(binder);

            interface_cast<IMediaPlayerService>(sMediaPlayer);

        if (service.get() != nullptr) {

            sRemoteList = service->getCodecList();

            if (sRemoteList != nullptr) {

                sBinderDeathObserver = new BinderDeathObserver();

                binder->linkToDeath(sBinderDeathObserver.get());

                sMediaPlayer->linkToDeath(sBinderDeathObserver.get());

            }

        }

        if (sRemoteList == nullptr) {

media/libstagefright/include/media/stagefright/MediaCodecList.h

+1 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ private: 
    };



    static sp<BinderDeathObserver> sBinderDeathObserver;

    static sp<IBinder> sMediaPlayer;



    static sp<IMediaCodecList> sCodecList;

    static sp<IMediaCodecList> sRemoteList;

services/audiopolicy/service/AudioPolicyService.cpp

+5 −8
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
#include <utils/Log.h>

#include <cutils/properties.h>

#include <binder/IPCThreadState.h>

#include <binder/ActivityManager.h>

#include <binder/PermissionController.h>

#include <binder/IResultReceiver.h>

#include <utils/String16.h>
@@ -774,28 +773,26 @@ status_t AudioPolicyService::printHelp(int out) { 
// -----------  AudioPolicyService::UidPolicy implementation ----------



void AudioPolicyService::UidPolicy::registerSelf() {

    ActivityManager am;

    am.registerUidObserver(this, ActivityManager::UID_OBSERVER_GONE

    status_t res = mAm.linkToDeath(this);

    mAm.registerUidObserver(this, ActivityManager::UID_OBSERVER_GONE

            | ActivityManager::UID_OBSERVER_IDLE

            | ActivityManager::UID_OBSERVER_ACTIVE

            | ActivityManager::UID_OBSERVER_PROCSTATE,

            ActivityManager::PROCESS_STATE_UNKNOWN,

            String16("audioserver"));

    status_t res = am.linkToDeath(this);

    if (!res) {

        Mutex::Autolock _l(mLock);

        mObserverRegistered = true;

    } else {

        ALOGE("UidPolicy::registerSelf linkToDeath failed: %d", res);



        am.unregisterUidObserver(this);

        mAm.unregisterUidObserver(this);

    }

}



void AudioPolicyService::UidPolicy::unregisterSelf() {

    ActivityManager am;

    am.unlinkToDeath(this);

    am.unregisterUidObserver(this);

    mAm.unlinkToDeath(this);

    mAm.unregisterUidObserver(this);

    Mutex::Autolock _l(mLock);

    mObserverRegistered = false;

}

services/audiopolicy/service/AudioPolicyService.h

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <utils/String8.h>

#include <utils/Vector.h>

#include <utils/SortedVector.h>

#include <binder/ActivityManager.h>

#include <binder/BinderService.h>

#include <binder/IUidObserver.h>

#include <system/audio.h>
@@ -387,6 +388,7 @@ private: 


        wp<AudioPolicyService> mService;

        Mutex mLock;

        ActivityManager mAm;

        bool mObserverRegistered;

        std::unordered_map<uid_t, std::pair<bool, int>> mOverrideUids;

        std::unordered_map<uid_t, std::pair<bool, int>> mCachedUids;

services/camera/libcameraservice/CameraService.cpp

+4 −6
Original line number Diff line number Diff line
@@ -2607,14 +2607,13 @@ void CameraService::Client::OpsCallback::opChanged(int32_t op, 
void CameraService::UidPolicy::registerSelf() {

    Mutex::Autolock _l(mUidLock);



    ActivityManager am;

    if (mRegistered) return;

    am.registerUidObserver(this, ActivityManager::UID_OBSERVER_GONE

    status_t res = mAm.linkToDeath(this);

    mAm.registerUidObserver(this, ActivityManager::UID_OBSERVER_GONE

            | ActivityManager::UID_OBSERVER_IDLE

            | ActivityManager::UID_OBSERVER_ACTIVE | ActivityManager::UID_OBSERVER_PROCSTATE,

            ActivityManager::PROCESS_STATE_UNKNOWN,

            String16("cameraserver"));

    status_t res = am.linkToDeath(this);

    if (res == OK) {

        mRegistered = true;

        ALOGV("UidPolicy: Registered with ActivityManager");
@@ -2624,9 +2623,8 @@ void CameraService::UidPolicy::registerSelf() { 
void CameraService::UidPolicy::unregisterSelf() {

    Mutex::Autolock _l(mUidLock);



    ActivityManager am;

    am.unregisterUidObserver(this);

    am.unlinkToDeath(this);

    mAm.unregisterUidObserver(this);

    mAm.unlinkToDeath(this);

    mRegistered = false;

    mActiveUids.clear();

    ALOGV("UidPolicy: Unregistered with ActivityManager");