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

am: ec955bbf91 Change-Id: I2981fe6d00fcc270a31f5baed59d42e0a9eccedf
2019-08-11 22:01:15 -07:00
parent 000a882ba3 ec955bbf91
commit e823655a9d
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);
        }
    }