Merge "Only unlink death recipient if binder was previously added" into sc-dev

2021-03-30 22:38:12 +00:00
parent ccaee1da1b 032ab0d892
commit b2724e8cb9
1 changed files with 5 additions and 1 deletions
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/RemoteTransitionHandler.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/RemoteTransitionHandler.java
@@ -84,12 +84,16 @@ public class RemoteTransitionHandler implements Transitions.TransitionHandler {
    }

    void removeFiltered(IRemoteTransition remote) {
-        remote.asBinder().unlinkToDeath(mTransitionDeathRecipient, 0 /* flags */);
+        boolean removed = false;
        for (int i = mFilters.size() - 1; i >= 0; --i) {
            if (mFilters.get(i).second == remote) {
                mFilters.remove(i);
+                removed = true;
            }
        }
+        if (removed) {
+            remote.asBinder().unlinkToDeath(mTransitionDeathRecipient, 0 /* flags */);
+        }
    }

    @Override