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

Commit a5514329 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "unlink IResourcesReclaimListener when remove client" into udc-dev am:... 

Merge "unlink IResourcesReclaimListener when remove client" into udc-dev am: bc76b268 am: df20ddc4

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



Change-Id: I717f4ce7741cb7826a8ed36f3cc867347615fec2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 078094f4 df20ddc4

services/core/java/com/android/server/tv/tunerresourcemanager/TunerResourceManagerService.java

+8 −1
Original line number Diff line number Diff line
@@ -2237,7 +2237,14 @@ public class TunerResourceManagerService extends SystemService implements IBinde 
        }

        clearAllResourcesAndClientMapping(getClientProfile(clientId));

        mClientProfiles.remove(clientId);

        mListeners.remove(clientId);



        // it may be called by unregisterClientProfileInternal under test

        synchronized (mLock) {

            ResourcesReclaimListenerRecord record = mListeners.remove(clientId);

            if (record != null) {

                record.getListener().asBinder().unlinkToDeath(record, 0);

            }            

        }

    }



    private void clearFrontendAndClientMapping(ClientProfile profile) {