commit 85ddfffd2f7414fbaf99f1750dcd89ed1aafddaa
author Siarhei Vishniakou <svv@google.com> Wed Jan 31 16:49:36 2018 -0800
committer Siarhei Vishniakou <svv@google.com> Tue Mar 06 11:53:07 2018 -0800
tree b5b9f66c13966f714f3b8af02e8ccbdc54016d68
parent f4a368200e22fcebb06d03c70ba7bd5b53913a5a

Move display id into MotionEvent

Display id is now part of MotionEvent.

Test: atest view.MotionEventTest view.KeyEventTest
Bug: 64258305

Change-Id: Ifadd6b34f4dd5a91669baf146daa62944d1de974

core/java/android/view/KeyEvent.java

diff --git a/core/java/android/view/KeyEvent.java b/core/java/android/view/KeyEvent.java
index a597405..dec0ecc 100644
--- a/core/java/android/view/KeyEvent.java
+++ b/core/java/android/view/KeyEvent.java
@@ -1556,8 +1556,8 @@
      * @hide
      */
     public static KeyEvent obtain(long downTime, long eventTime, int action,
-                    int code, int repeat, int metaState,
-                    int deviceId, int scancode, int flags, int source, String characters) {
+            int code, int repeat, int metaState,
+            int deviceId, int scancode, int flags, int source, String characters) {
         KeyEvent ev = obtain();
         ev.mDownTime = downTime;
         ev.mEventTime = eventTime;