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

Commit 1d70478e authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

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

parents e38d3871 f06d8127

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

+6 −3
Original line number Diff line number Diff line
@@ -581,11 +581,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) {