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

Merge "Fixed initial mDisplayId on KeyEvent."

Browse Source
This commit is contained in:
Felipe Leme
2023-02-14 15:29:15 +00:00
committed by Android (Google) Code Review
parent 3eca80404a 597956c361
commit c55eb34f87
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/view/KeyEvent.java
View File

@@ -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;
}
/**

11
core/tests/coretests/src/android/view/KeyEventTest.java
View File

@@ -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() {