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

Fix a NPE in InputMonitor#updateInputFocusRequest

Browse Source 
..introduced by CL[1] that getTask() may null if the activity is
removing.

[1]: I71f397b93b9f94e9351ded8191676b1dfb249d9e

Fix: 282114478
Bug: 222064495
Test: all tests passed
Change-Id: Ie24370d4ae06a82e9e5ab4d0f728226cc11b8852
This commit is contained in:
Ming-Shin Lu
2023-05-12 13:39:49 +00:00
parent d83febadd7
commit d558f89afc
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -439,7 +439,9 @@ final class InputMonitor {
? mDisplayContent.getImeInputTarget().getActivityRecord() : null;
if (app != null) {
mDisplayContent.removeImeSurfaceImmediately();
mDisplayContent.mAtmService.takeTaskSnapshot(app.getTask().mTaskId);
if (app.getTask() != null) {
mDisplayContent.mAtmService.takeTaskSnapshot(app.getTask().mTaskId);
}
}
} else {
// Disable IME icon explicitly when IME attached to the app in case