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

Merge "Fix a NPE in InputMonitor#updateInputFocusRequest" into udc-dev am: 6979ba4278

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

Change-Id: Ib116649197c5e1fc19ce4a96ac58ac87d07b8660
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Ming-Shin Lu
2023-05-13 00:47:33 +00:00
committed by Automerger Merge Worker
parent 0070c2f172 6979ba4278
commit 5de2174438
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; ? mDisplayContent.getImeInputTarget().getActivityRecord() : null;
if (app != null) { if (app != null) {
mDisplayContent.removeImeSurfaceImmediately(); mDisplayContent.removeImeSurfaceImmediately();
mDisplayContent.mAtmService.takeTaskSnapshot(app.getTask().mTaskId); if (app.getTask() != null) {
mDisplayContent.mAtmService.takeTaskSnapshot(app.getTask().mTaskId);
}
} }
} else { } else {
// Disable IME icon explicitly when IME attached to the app in case // Disable IME icon explicitly when IME attached to the app in case