Merge "Fix reference leak on TvInputHardwareManager"

am: 8b578c9c92 Change-Id: I7fb3e249c5ae0102d61783b6bd2e70a823297a94
2019-08-11 21:32:00 -07:00
parent 41c9e7092e 8b578c9c92
commit c91d1ea7ed
1 changed files with 4 additions and 0 deletions
--- 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);
        }
    }