Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Winson Chung
2021-08-31 17:26:02 +00:00
committed by Android (Google) Code Review
parent e38d387169 f06d81271c
commit 1d70478e12
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/wm/InputMonitor.java
View File

@@ -581,11 +581,14 @@ final class InputMonitor {
if (mAddRecentsAnimationInputConsumerHandle && shouldApplyRecentsInputConsumer) { if (mAddRecentsAnimationInputConsumerHandle && shouldApplyRecentsInputConsumer) {
if (recentsAnimationController.updateInputConsumerForApp( if (recentsAnimationController.updateInputConsumerForApp(
mRecentsAnimationInputConsumer.mWindowHandle)) { mRecentsAnimationInputConsumer.mWindowHandle)) {
mRecentsAnimationInputConsumer.show(mInputTransaction, final WindowState highestLayerWindow =
recentsAnimationController.getHighestLayerWindow()); recentsAnimationController.getHighestLayerWindow();
if (highestLayerWindow != null) {
mRecentsAnimationInputConsumer.show(mInputTransaction, highestLayerWindow);
mAddRecentsAnimationInputConsumerHandle = false; mAddRecentsAnimationInputConsumerHandle = false;
} }
} }
}
if (w.inPinnedWindowingMode()) { if (w.inPinnedWindowingMode()) {
if (mAddPipInputConsumerHandle) { if (mAddPipInputConsumerHandle) {