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

Merge "Add null check for IM#getInputDevice(id) in IMMS"

Browse Source
This commit is contained in:
TreeHugger Robot
2022-07-29 04:42:17 +00:00
committed by Android (Google) Code Review
parent a97e9a07d5 433a1ad2b8
commit a8f4fc7f92
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
View File

@@ -4341,7 +4341,8 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub
im.registerInputDeviceListener(new InputManager.InputDeviceListener() {
@Override
public void onInputDeviceAdded(int deviceId) {
if (isStylusDevice(im.getInputDevice(deviceId))) {
InputDevice device = im.getInputDevice(deviceId);
if (device != null && isStylusDevice(device)) {
add(deviceId);
}
}
@@ -4353,7 +4354,11 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub
@Override
public void onInputDeviceChanged(int deviceId) {
if (isStylusDevice(im.getInputDevice(deviceId))) {
InputDevice device = im.getInputDevice(deviceId);
if (device == null) {
return;
}
if (isStylusDevice(device)) {
add(deviceId);
} else {
remove(deviceId);
@@ -4452,8 +4457,8 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub
if (!im.isInputDeviceEnabled(id)) {
continue;
}
InputDevice inputDevice = im.getInputDevice(id);
if (isStylusDevice(inputDevice)) {
InputDevice device = im.getInputDevice(id);
if (device != null && isStylusDevice(device)) {
stylusIds.add(id);
}
}