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

Commit 0b022590 authored by Ming-Shin Lu's avatar Ming-Shin Lu Committed by Automerger Merge Worker
Browse files

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

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

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



Change-Id: I70e10823136c925628425249b51ecf7a7ef50441
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fd6601c3 5de21744

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

+3 −1
Original line number Diff line number Diff line
@@ -439,8 +439,10 @@ final class InputMonitor { 
                                ? mDisplayContent.getImeInputTarget().getActivityRecord() : null;

                        if (app != null) {

                            mDisplayContent.removeImeSurfaceImmediately();

                            if (app.getTask() != null) {

                                mDisplayContent.mAtmService.takeTaskSnapshot(app.getTask().mTaskId);

                            }

                        }

                    } else {

                        // Disable IME icon explicitly when IME attached to the app in case

                        // IME icon might flickering while swiping to the next app task still