diff --git a/core/java/android/view/KeyEvent.java b/core/java/android/view/KeyEvent.java index 61582cdf07a7a..1a5613ebef021 100644 --- a/core/java/android/view/KeyEvent.java +++ b/core/java/android/view/KeyEvent.java @@ -1351,7 +1351,7 @@ public class KeyEvent extends InputEvent implements Parcelable { private int mDeviceId; @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) private int mSource; - private int mDisplayId; + private int mDisplayId = INVALID_DISPLAY; private @Nullable byte[] mHmac; @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) private int mMetaState; @@ -1602,7 +1602,6 @@ public class KeyEvent extends InputEvent implements Parcelable { mScanCode = scancode; mFlags = flags; mSource = source; - mDisplayId = INVALID_DISPLAY; } /** @@ -1628,7 +1627,6 @@ public class KeyEvent extends InputEvent implements Parcelable { mDeviceId = deviceId; mFlags = flags; mSource = InputDevice.SOURCE_KEYBOARD; - mDisplayId = INVALID_DISPLAY; } /** diff --git a/core/tests/coretests/src/android/view/KeyEventTest.java b/core/tests/coretests/src/android/view/KeyEventTest.java index c10ef007c3c0b..cbf11c4e2e1f4 100644 --- a/core/tests/coretests/src/android/view/KeyEventTest.java +++ b/core/tests/coretests/src/android/view/KeyEventTest.java @@ -170,8 +170,7 @@ public final class KeyEventTest { DEVICE_ID, SCAN_CODE, FLAGS); assertKeyEventFields(key, DOWN_TIME, EVENT_TIME, ACTION, KEYCODE, REPEAT, METASTATE, - DEVICE_ID, SCAN_CODE, FLAGS, /* source= */ 0, /* displayId= */ 0, - CHARACTERS); + DEVICE_ID, SCAN_CODE, FLAGS, /* source= */ 0, INVALID_DISPLAY, CHARACTERS); } @Test @@ -180,7 +179,7 @@ public final class KeyEventTest { DEVICE_ID, SCAN_CODE); assertKeyEventFields(key, DOWN_TIME, EVENT_TIME, ACTION, KEYCODE, REPEAT, METASTATE, - DEVICE_ID, SCAN_CODE, /* flags= */ 0, /* source= */ 0, /* displayId= */ 0, + DEVICE_ID, SCAN_CODE, /* flags= */ 0, /* source= */ 0, INVALID_DISPLAY, CHARACTERS); } @@ -190,7 +189,7 @@ public final class KeyEventTest { assertKeyEventFields(key, DOWN_TIME, EVENT_TIME, ACTION, KEYCODE, REPEAT, METASTATE, KeyCharacterMap.VIRTUAL_KEYBOARD, /* scanCode= */ 0, /* flags= */ 0, - /* source= */ 0, /* displayId= */ 0, CHARACTERS); + /* source= */ 0, INVALID_DISPLAY, CHARACTERS); } @Test @@ -199,7 +198,7 @@ public final class KeyEventTest { assertKeyEventFields(key, DOWN_TIME, EVENT_TIME, ACTION, KEYCODE, REPEAT, /* metaState= */ 0, KeyCharacterMap.VIRTUAL_KEYBOARD, /* scanCode= */ 0, - /* flags= */ 0, /* source= */ 0, /* displayId= */ 0, CHARACTERS); + /* flags= */ 0, /* source= */ 0, INVALID_DISPLAY, CHARACTERS); } @Test @@ -217,7 +216,7 @@ public final class KeyEventTest { assertKeyEventFields(key, /* downTime= */ 0, /* eventTime= */ 0, ACTION, KEYCODE, /* repeat= */ 0, /* metaState= */ 0, KeyCharacterMap.VIRTUAL_KEYBOARD, - /* scanCode= */ 0, FLAGS, /* source= */ 0, /* displayId= */ 0, CHARACTERS); + /* scanCode= */ 0, FLAGS, /* source= */ 0, INVALID_DISPLAY, CHARACTERS); } private static KeyEvent createKey() {