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

Commit 830593ee authored by George Mount's avatar George Mount Committed by Android Git Automerger
Browse files

am aeb0a9db: am 95d520f1: Merge "Fix NPE in moveSharedElementsToOverlay" into... 

am aeb0a9db: am 95d520f1: Merge "Fix NPE in moveSharedElementsToOverlay" into lmp-mr1-dev automerge: 8a536bb4

* commit 'aeb0a9db':
  Fix NPE in moveSharedElementsToOverlay
parents 7883be77 aeb0a9db

core/java/android/app/ActivityTransitionCoordinator.java

+1 −1
Original line number Diff line number Diff line
@@ -798,7 +798,7 @@ abstract class ActivityTransitionCoordinator extends ResultReceiver { 
    }



    protected void moveSharedElementsToOverlay() {

        if (!mWindow.getSharedElementsUseOverlay()) {

        if (mWindow == null || !mWindow.getSharedElementsUseOverlay()) {

            return;

        }

        setSharedElementMatrices();