From 22076636ea712940f6fddc9c0414f2624b8b95f3 Mon Sep 17 00:00:00 2001
From: Evan Rosky <erosky@google.com>
Date: Thu, 16 Sep 2021 17:45:04 -0700
Subject: [PATCH] Use binder for remote unregister comparison

Only the binder objects match, so use those for finding
which filters to unregister.

Bug: 200213691
Test: atest CloseAppHomeButtonTest
      change gesture modes and observe continuing functional anims
Change-Id: Id6e35bd9181462be5594ff8fb6898604df6d9bff
---
 .../android/wm/shell/transition/RemoteTransitionHandler.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/RemoteTransitionHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/RemoteTransitionHandler.java
index ac612a7063d2a..c798ace18b5fc 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/RemoteTransitionHandler.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/RemoteTransitionHandler.java
@@ -71,7 +71,7 @@ public class RemoteTransitionHandler implements Transitions.TransitionHandler {
     void removeFiltered(RemoteTransition remote) {
         boolean removed = false;
         for (int i = mFilters.size() - 1; i >= 0; --i) {
-            if (mFilters.get(i).second == remote) {
+            if (mFilters.get(i).second.asBinder().equals(remote.asBinder())) {
                 mFilters.remove(i);
                 removed = true;
             }