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

Commit 248cf409 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 am: 134be832 

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



Change-Id: I29a5cb31f07ee34a46941b76319a0b312e2e20e2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 14fc0df7 134be832

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;

        }

    }