From bf04b9d9e58cdf2dc819dc72bbb55bc5233a0ed5 Mon Sep 17 00:00:00 2001
From: Maryam Dehaini <mdehaini@google.com>
Date: Wed, 5 Apr 2023 17:18:18 -0700
Subject: [PATCH] Add null check to onTransitionMerged

Checks to see if mTransitionPausingRelayout is null before comparing it
to the merged transition IBinder.

Bug: 276973868
Test: Manual Testing
Change-Id: I772a2dfa4c29c0a78b09c2c1c7f0a5a790795604
---
 .../wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java
index f99821747fef7..7e178d32df6fd 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java
@@ -197,7 +197,7 @@ public class DesktopModeWindowDecorViewModel implements WindowDecorViewModel {
 
     @Override
     public void onTransitionMerged(@NonNull IBinder merged, @NonNull IBinder playing) {
-        if (mTransitionPausingRelayout.equals(merged)) {
+        if (merged.equals(mTransitionPausingRelayout)) {
             mTransitionPausingRelayout = playing;
         }
     }