Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f572aecd authored by Maryam Dehaini's avatar Maryam Dehaini Committed by Automerger Merge Worker
Browse files

Merge "Add null check to onTransitionMerged" into udc-dev am: 7b888dcc 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22499852



Change-Id: Id10cadc008c1bea54b3a932e9b31f5f3fed44a32
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 41c01632 7b888dcc

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

+1 −1
Original line number Diff line number Diff line
@@ -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;

        }

    }