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

Commit 251ebce5 authored by Winson Chung's avatar Winson Chung Committed by Automerger Merge Worker
Browse files

Merge "Fixing crash when activity doesn't have a window" into sc-v2-dev am:... 

Merge "Fixing crash when activity doesn't have a window" into sc-v2-dev am: 1d70478e am: 61d49477

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

Change-Id: I5835833278185f204a952a878442dd33805170f0
parents 61141e52 61d49477

services/core/java/com/android/server/wm/InputMonitor.java

+6 −3
Original line number Diff line number Diff line
@@ -580,11 +580,14 @@ final class InputMonitor { 
            if (mAddRecentsAnimationInputConsumerHandle && shouldApplyRecentsInputConsumer) {

                if (recentsAnimationController.updateInputConsumerForApp(

                        mRecentsAnimationInputConsumer.mWindowHandle)) {

                    mRecentsAnimationInputConsumer.show(mInputTransaction,

                            recentsAnimationController.getHighestLayerWindow());

                    final WindowState highestLayerWindow =

                            recentsAnimationController.getHighestLayerWindow();

                    if (highestLayerWindow != null) {

                        mRecentsAnimationInputConsumer.show(mInputTransaction, highestLayerWindow);

                        mAddRecentsAnimationInputConsumerHandle = false;

                    }

                }

            }



            if (w.inPinnedWindowingMode()) {

                if (mAddPipInputConsumerHandle) {