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

Merge "Fix NPE in notifyFocusChanged"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-01-14 16:28:51 +00:00
committed by Android (Google) Code Review
parent 5ee3cb872c 63e4053ffd
commit 4665762004
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/input/InputManagerService.java
View File

@@ -1761,12 +1761,15 @@ public class InputManagerService extends IInputManager.Stub
// Native callback
private void notifyFocusChanged(IBinder oldToken, IBinder newToken) {
if (mFocusedWindow.asBinder() == newToken) {
Log.w(TAG, "notifyFocusChanged called with unchanged mFocusedWindow=" + mFocusedWindow);
return;
if (mFocusedWindow != null) {
if (mFocusedWindow.asBinder() == newToken) {
Slog.w(TAG, "notifyFocusChanged called with unchanged mFocusedWindow="
+ mFocusedWindow);
return;
}
setPointerCapture(false);
}
setPointerCapture(false);
mFocusedWindow = IWindow.Stub.asInterface(newToken);
}