| commit | 7b888dcc01e43d21f3297fb2abea354e9e209064 | [log] [tgz] |
|---|---|---|
| author | Maryam Dehaini <mdehaini@google.com> | Thu Apr 06 22:49:06 2023 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Apr 06 22:49:06 2023 +0000 |
| tree | bbf4ef4a8d250abfb5064b12e79bc2ea627825ef | |
| parent | 93b092bdd7e02ead41f9a8044d380865367f66bb [diff] | |
| parent | bf04b9d9e58cdf2dc819dc72bbb55bc5233a0ed5 [diff] |
Merge "Add null check to onTransitionMerged" into udc-dev
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; } }