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

am: c8029bfbc3 Change-Id: I514b670dfed23fecebd5b3f67ab47e2940fa341b
2019-08-01 01:11:37 -07:00
parent 3e4f5ece0a c8029bfbc3
commit 88d4bf0964
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;