Merge "Fix reference leak on TvInputHardwareManager" am: 8b578c9c92 am: c91d1ea7ed am: ec955bbf91 am: e823655a9d

am: 8cbdd3af0c

Change-Id: I204d30c7852a6ee6909d5eee36d043023c6de735

1 files changed, 4 insertions, 0 deletions

diff --git a/services/core/java/com/android/server/tv/TvInputHardwareManager.java b/services/core/java/com/android/server/tv/TvInputHardwareManager.java
index f08e58579975..6ea274d8a814 100755
--- a/services/core/java/com/android/server/tv/TvInputHardwareManager.java
+++ b/services/core/java/com/android/server/tv/TvInputHardwareManager.java
@@ -403,6 +403,10 @@ class TvInputHardwareManager implements TvInputHal.Callback {
                     || checkUidChangedLocked(connection, callingUid, resolvedUserId)) {
                 return;
             }
+            ITvInputHardwareCallback callback = connection.getCallbackLocked();
+            if (callback != null) {
+                callback.asBinder().unlinkToDeath(connection, 0);
+            }
             connection.resetLocked(null, null, null, null, null);
         }
     }