Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 597956c3 authored by Felipe Leme's avatar Felipe Leme
Browse files

Fixed initial mDisplayId on KeyEvent. 

Some constructors were explicitly setting it to INVALID_DISPLAY,
while others wouldn't (and in those cases mDisplayId would be 0,
which is DEFAULT_DISPLAY), which made it harder to change the
display id for tests running on background users visible on
secondary displays.

Test: atest KeyEventTest CtsAppTestCases:android.app.cts.LauncherActivityTest
Bug: 266851112
Fixes: 268103680

Change-Id: I9ee61784109620f7b505d8b8db479b37b9a42e20
parent dc6ec7e8

core/java/android/view/KeyEvent.java

+1 −3
Original line number Diff line number Diff line
@@ -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;

    }



    /**

core/tests/coretests/src/android/view/KeyEventTest.java

+5 −6
Original line number Diff line number Diff line
@@ -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() {