diff options
Diffstat (limited to 'core/java/android/view/ViewRootImpl.java')
| -rw-r--r-- | core/java/android/view/ViewRootImpl.java | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index da7799c1ec3f..ffebf711e43e 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -3585,8 +3585,9 @@ public final class ViewRootImpl implements ViewParent, handleDispatchWindowShown(); } break; case MSG_REQUEST_KEYBOARD_SHORTCUTS: { - IResultReceiver receiver = (IResultReceiver) msg.obj; - handleRequestKeyboardShortcuts(receiver); + final IResultReceiver receiver = (IResultReceiver) msg.obj; + final int deviceId = msg.arg1; + handleRequestKeyboardShortcuts(receiver, deviceId); } break; case MSG_UPDATE_POINTER_ICON: { MotionEvent event = (MotionEvent) msg.obj; @@ -5507,11 +5508,11 @@ public final class ViewRootImpl implements ViewParent, mAttachInfo.mTreeObserver.dispatchOnWindowShown(); } - public void handleRequestKeyboardShortcuts(IResultReceiver receiver) { + public void handleRequestKeyboardShortcuts(IResultReceiver receiver, int deviceId) { Bundle data = new Bundle(); ArrayList<KeyboardShortcutGroup> list = new ArrayList<>(); if (mView != null) { - mView.requestKeyboardShortcuts(list); + mView.requestKeyboardShortcuts(list, deviceId); } data.putParcelableArrayList(WindowManager.PARCEL_KEY_SHORTCUTS_ARRAY, list); try { @@ -6468,8 +6469,9 @@ public final class ViewRootImpl implements ViewParent, } } - public void dispatchRequestKeyboardShortcuts(IResultReceiver receiver) { - mHandler.obtainMessage(MSG_REQUEST_KEYBOARD_SHORTCUTS, receiver).sendToTarget(); + public void dispatchRequestKeyboardShortcuts(IResultReceiver receiver, int deviceId) { + mHandler.obtainMessage( + MSG_REQUEST_KEYBOARD_SHORTCUTS, deviceId, 0, receiver).sendToTarget(); } /** @@ -7046,11 +7048,11 @@ public final class ViewRootImpl implements ViewParent, } @Override - public void requestAppKeyboardShortcuts(IResultReceiver receiver) { - ViewRootImpl viewAncestor = mViewAncestor.get(); - if (viewAncestor != null) { - viewAncestor.dispatchRequestKeyboardShortcuts(receiver); - } + public void requestAppKeyboardShortcuts(IResultReceiver receiver, int deviceId) { + ViewRootImpl viewAncestor = mViewAncestor.get(); + if (viewAncestor != null) { + viewAncestor.dispatchRequestKeyboardShortcuts(receiver, deviceId); + } } } |