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

Commit 0220cf4d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "ITvInputManagerCallback leak when client died" into main am: 91f912fe 

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



Change-Id: I0fdf555961d3aad1d269ebfbdc2762e3e801799a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d13c1184 91f912fe

services/core/java/com/android/server/tv/TvInputManagerService.java

+16 −3
Original line number Diff line number Diff line
@@ -3254,7 +3254,20 @@ public final class TvInputManagerService extends SystemService { 
        return filteredDisplayName;

    }



    private static final class UserState {

    private class TvInputManagerCallbackList extends RemoteCallbackList<ITvInputManagerCallback> {

        @Override

        public void onCallbackDied(ITvInputManagerCallback callback) {

            synchronized (mLock) {

                for (int i = 0; i < mUserStates.size(); i++) {

                    int userId = mUserStates.keyAt(i);

                    UserState userState = getOrCreateUserStateLocked(userId);

                    userState.callbackPidUidMap.remove(callback);

                }

            }

        }

    }



    private final class UserState {

        // A mapping from the TV input id to its TvInputState.

        private Map<String, TvInputState> inputMap = new HashMap<>();
@@ -3275,8 +3288,8 @@ public final class TvInputManagerService extends SystemService { 
        private final Map<IBinder, SessionState> sessionStateMap = new HashMap<>();



        // A list of callbacks.

        private final RemoteCallbackList<ITvInputManagerCallback> mCallbacks =

                new RemoteCallbackList<>();

        private final TvInputManagerCallbackList mCallbacks =

                new TvInputManagerCallbackList();



        private final Map<ITvInputManagerCallback, Pair<Integer, Integer>> callbackPidUidMap =

                new HashMap<>();