Merge "Fix the reference leak on RemoteCallbackList" am: be30d27a8a am: ea493e4c77

am: dbf00b6a0b Change-Id: If49b4ffddb6e578d82c1ad4b6c26f8153bb48a3a
2019-08-01 00:58:51 -07:00
parent b85761223a dbf00b6a0b
commit c8029bfbc3
1 changed files with 1 additions and 0 deletions
--- a/core/java/android/os/RemoteCallbackList.java
+++ b/core/java/android/os/RemoteCallbackList.java
@@ -123,6 +123,7 @@ public class RemoteCallbackList<E extends IInterface> {
            IBinder binder = callback.asBinder();
            try {
                Callback cb = new Callback(callback, cookie);
+                unregister(callback);
                binder.linkToDeath(cb, 0);
                mCallbacks.put(binder, cb);
                return true;