commit bf04b9d9e58cdf2dc819dc72bbb55bc5233a0ed5
author Maryam Dehaini <mdehaini@google.com> Wed Apr 05 17:18:18 2023 -0700
committer Maryam Dehaini <mdehaini@google.com> Thu Apr 06 17:55:48 2023 +0000
tree 9bc09e6bad5c0bff16e794c6682a420dfda8a13d
parent d5494efd55d034b6f862df96f584e4e7becb6499

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

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DesktopModeWindowDecorViewModel.java

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 f998217..7e178d3 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 @@
 
     @Override
     public void onTransitionMerged(@NonNull IBinder merged, @NonNull IBinder playing) {
-        if (mTransitionPausingRelayout.equals(merged)) {
+        if (merged.equals(mTransitionPausingRelayout)) {
             mTransitionPausingRelayout = playing;
         }
     }