commit e823655a9d5456d96010b986e951feb9c814c90a
author Sungsoo Lim <sungsoo@google.com> Sun Aug 11 22:01:15 2019 -0700
committer android-build-merger <android-build-merger@google.com> Sun Aug 11 22:01:15 2019 -0700
tree fb1cd9c782edbe195bd1e7aebe40e8f4b8381288
parent 000a882ba340bd560a78de35587287cb36a2aa2b
parent ec955bbf91c84961532d2df9dd8071b204a51414

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

Change-Id: I2981fe6d00fcc270a31f5baed59d42e0a9eccedf

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

diff --git a/services/core/java/com/android/server/tv/TvInputHardwareManager.java b/services/core/java/com/android/server/tv/TvInputHardwareManager.java
index f08e585..6ea274d 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 @@
                     || checkUidChangedLocked(connection, callingUid, resolvedUserId)) {
                 return;
             }
+            ITvInputHardwareCallback callback = connection.getCallbackLocked();
+            if (callback != null) {
+                callback.asBinder().unlinkToDeath(connection, 0);
+            }
             connection.resetLocked(null, null, null, null, null);
         }
     }