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 am: 1d70478e12 am: 61d4947796

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

Change-Id: I5835833278185f204a952a878442dd33805170f0
This commit is contained in:
Winson Chung
2021-08-31 17:59:11 +00:00
committed by Automerger Merge Worker
parent 61141e525a 61d4947796
commit 251ebce586
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -580,9 +580,12 @@ final class InputMonitor {
if (mAddRecentsAnimationInputConsumerHandle && shouldApplyRecentsInputConsumer) {
if (recentsAnimationController.updateInputConsumerForApp(
mRecentsAnimationInputConsumer.mWindowHandle)) {
mRecentsAnimationInputConsumer.show(mInputTransaction,
recentsAnimationController.getHighestLayerWindow());
mAddRecentsAnimationInputConsumerHandle = false;
final WindowState highestLayerWindow =
recentsAnimationController.getHighestLayerWindow();
if (highestLayerWindow != null) {
mRecentsAnimationInputConsumer.show(mInputTransaction, highestLayerWindow);
mAddRecentsAnimationInputConsumerHandle = false;
}
}
}