Merge "Add null check to onTransitionMerged" into udc-dev

This commit is contained in:
Maryam Dehaini
2023-04-06 22:49:06 +00:00
committed by Android (Google) Code Review

View File

@@ -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;
}
}