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

Commit 147fdec1 authored by Riddle Hsu's avatar Riddle Hsu Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE in InputManagerCallback#notifyFocusChanged"

parents c3b70b5c d82d6e0a

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

+2 −1
Original line number Diff line number Diff line
@@ -266,7 +266,8 @@ final class InputManagerCallback implements InputManagerService.WindowManagerCal 


        final IWindow focusedWindow = mFocusedWindow.get();

        if (focusedWindow != null) {

            if (focusedWindow.asBinder() == newFocusedWindow.asBinder()) {

            if (newFocusedWindow != null

                    && newFocusedWindow.asBinder() == focusedWindow.asBinder()) {

                Slog.w(TAG, "notifyFocusChanged called with unchanged mFocusedWindow="

                        + focusedWindow);

                return false;