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

Commit 44ff4fc9 authored by Arpit Singh's avatar Arpit Singh
Browse files

Add method to setDefaultMouseDisplay in ChoreographerTest 

This CL adds setDefaultMouseDisplayId method to the
PointerChoreographerTest base class.
This will allow us to customize this in the next CL.

Test: atest inputflinger_tests
Bug: 245989146
Flag: EXEMPT TEST_ONLY
Change-Id: Ieea0f252b21fc0eb3002201feb36bdb2bb546488
parent 9fd5fdd4

services/inputflinger/tests/PointerChoreographer_test.cpp

+51 −48
Original line number Diff line number Diff line
@@ -140,6 +140,10 @@ protected: 
                });

    }



    void setDefaultMouseDisplayId(ui::LogicalDisplayId displayId) {

        mChoreographer.setDefaultMouseDisplayId(displayId);

    }



    std::shared_ptr<FakePointerController> assertPointerControllerCreated(

            ControllerType expectedType) {

        EXPECT_FALSE(mCreatedControllers.empty()) << "No PointerController was created";
@@ -292,7 +296,7 @@ TEST_F(PointerChoreographerTest, WhenViewportSetLaterSetsViewportForAssociatedMo 


TEST_F(PointerChoreographerTest, SetsDefaultMouseViewportForPointerController) {

    mChoreographer.setDisplayViewports(createViewports({DISPLAY_ID}));

    mChoreographer.setDefaultMouseDisplayId(DISPLAY_ID);

    setDefaultMouseDisplayId(DISPLAY_ID);



    // For a mouse event without a target display, default viewport should be set for

    // the PointerController.
@@ -309,7 +313,7 @@ TEST_F(PointerChoreographerTest, 
       WhenDefaultMouseDisplayChangesSetsDefaultMouseViewportForPointerController) {

    // Set one display as a default mouse display and emit mouse event to create PointerController.

    mChoreographer.setDisplayViewports(createViewports({DISPLAY_ID, ANOTHER_DISPLAY_ID}));

    mChoreographer.setDefaultMouseDisplayId(DISPLAY_ID);

    setDefaultMouseDisplayId(DISPLAY_ID);

    mChoreographer.notifyInputDevicesChanged(

            {/*id=*/0,

             {generateTestDeviceInfo(DEVICE_ID, AINPUT_SOURCE_MOUSE,
@@ -320,7 +324,7 @@ TEST_F(PointerChoreographerTest, 


    // Change default mouse display. Existing PointerController should be removed and a new one

    // should be created.

    mChoreographer.setDefaultMouseDisplayId(ANOTHER_DISPLAY_ID);

    setDefaultMouseDisplayId(ANOTHER_DISPLAY_ID);

    assertPointerControllerRemoved(firstDisplayPc);



    auto secondDisplayPc = assertPointerControllerCreated(ControllerType::MOUSE);
@@ -329,7 +333,7 @@ TEST_F(PointerChoreographerTest, 
}



TEST_F(PointerChoreographerTest, CallsNotifyPointerDisplayIdChanged) {

    mChoreographer.setDefaultMouseDisplayId(DISPLAY_ID);

    setDefaultMouseDisplayId(DISPLAY_ID);

    mChoreographer.setDisplayViewports(createViewports({DISPLAY_ID}));

    mChoreographer.notifyInputDevicesChanged(

            {/*id=*/0,
@@ -341,7 +345,7 @@ TEST_F(PointerChoreographerTest, CallsNotifyPointerDisplayIdChanged) { 
}



TEST_F(PointerChoreographerTest, WhenViewportIsSetLaterCallsNotifyPointerDisplayIdChanged) {

    mChoreographer.setDefaultMouseDisplayId(DISPLAY_ID);

    setDefaultMouseDisplayId(DISPLAY_ID);

    mChoreographer.notifyInputDevicesChanged(

            {/*id=*/0,

             {generateTestDeviceInfo(DEVICE_ID, AINPUT_SOURCE_MOUSE,
@@ -354,7 +358,7 @@ TEST_F(PointerChoreographerTest, WhenViewportIsSetLaterCallsNotifyPointerDisplay 
}



TEST_F(PointerChoreographerTest, WhenMouseIsRemovedCallsNotifyPointerDisplayIdChanged) {

    mChoreographer.setDefaultMouseDisplayId(DISPLAY_ID);

    setDefaultMouseDisplayId(DISPLAY_ID);

    mChoreographer.setDisplayViewports(createViewports({DISPLAY_ID}));

    mChoreographer.notifyInputDevicesChanged(

            {/*id=*/0,
@@ -373,7 +377,7 @@ TEST_F(PointerChoreographerTest, WhenDefaultMouseDisplayChangesCallsNotifyPointe 
    mChoreographer.setDisplayViewports(createViewports({DISPLAY_ID, ANOTHER_DISPLAY_ID}));



    // Set one viewport as a default mouse display ID.

    mChoreographer.setDefaultMouseDisplayId(DISPLAY_ID);

    setDefaultMouseDisplayId(DISPLAY_ID);

    mChoreographer.notifyInputDevicesChanged(

            {/*id=*/0,

             {generateTestDeviceInfo(DEVICE_ID, AINPUT_SOURCE_MOUSE,
@@ -382,7 +386,7 @@ TEST_F(PointerChoreographerTest, WhenDefaultMouseDisplayChangesCallsNotifyPointe 
    assertPointerDisplayIdNotified(DISPLAY_ID);



    // Set another viewport as a default mouse display ID. The mouse is moved to the other display.

    mChoreographer.setDefaultMouseDisplayId(ANOTHER_DISPLAY_ID);

    setDefaultMouseDisplayId(ANOTHER_DISPLAY_ID);

    assertPointerControllerRemoved(firstDisplayPc);



    assertPointerControllerCreated(ControllerType::MOUSE);
@@ -391,7 +395,7 @@ TEST_F(PointerChoreographerTest, WhenDefaultMouseDisplayChangesCallsNotifyPointe 


TEST_F(PointerChoreographerTest, MouseMovesPointerAndReturnsNewArgs) {

    mChoreographer.setDisplayViewports(createViewports({DISPLAY_ID}));

    mChoreographer.setDefaultMouseDisplayId(DISPLAY_ID);

    setDefaultMouseDisplayId(DISPLAY_ID);

    mChoreographer.notifyInputDevicesChanged(

            {/*id=*/0,

             {generateTestDeviceInfo(DEVICE_ID, AINPUT_SOURCE_MOUSE,
@@ -421,7 +425,7 @@ TEST_F(PointerChoreographerTest, MouseMovesPointerAndReturnsNewArgs) { 


TEST_F(PointerChoreographerTest, AbsoluteMouseMovesPointerAndReturnsNewArgs) {

    mChoreographer.setDisplayViewports(createViewports({DISPLAY_ID}));

    mChoreographer.setDefaultMouseDisplayId(DISPLAY_ID);

    setDefaultMouseDisplayId(DISPLAY_ID);

    mChoreographer.notifyInputDevicesChanged(

            {/*id=*/0,

             {generateTestDeviceInfo(DEVICE_ID, AINPUT_SOURCE_MOUSE,
@@ -457,7 +461,7 @@ TEST_F(PointerChoreographerTest, 
       AssociatedMouseMovesPointerOnAssociatedDisplayAndDoesNotMovePointerOnDefaultDisplay) {

    // Add two displays and set one to default.

    mChoreographer.setDisplayViewports(createViewports({DISPLAY_ID, ANOTHER_DISPLAY_ID}));

    mChoreographer.setDefaultMouseDisplayId(DISPLAY_ID);

    setDefaultMouseDisplayId(DISPLAY_ID);



    // Add two devices, one unassociated and the other associated with non-default mouse display.

    mChoreographer.notifyInputDevicesChanged(
@@ -496,7 +500,7 @@ TEST_F(PointerChoreographerTest, 


TEST_F(PointerChoreographerTest, DoesNotMovePointerForMouseRelativeSource) {

    mChoreographer.setDisplayViewports(createViewports({DISPLAY_ID}));

    mChoreographer.setDefaultMouseDisplayId(DISPLAY_ID);

    setDefaultMouseDisplayId(DISPLAY_ID);

    mChoreographer.notifyInputDevicesChanged(

            {/*id=*/0,

             {generateTestDeviceInfo(DEVICE_ID, AINPUT_SOURCE_MOUSE,
@@ -543,7 +547,7 @@ TEST_F(PointerChoreographerTest, DoesNotMovePointerForMouseRelativeSource) { 


TEST_F(PointerChoreographerTest, WhenPointerCaptureEnabledHidesPointer) {

    mChoreographer.setDisplayViewports(createViewports({DISPLAY_ID}));

    mChoreographer.setDefaultMouseDisplayId(DISPLAY_ID);

    setDefaultMouseDisplayId(DISPLAY_ID);

    mChoreographer.notifyInputDevicesChanged(

            {/*id=*/0,

             {generateTestDeviceInfo(DEVICE_ID, AINPUT_SOURCE_MOUSE,
@@ -562,7 +566,7 @@ TEST_F(PointerChoreographerTest, WhenPointerCaptureEnabledHidesPointer) { 


TEST_F(PointerChoreographerTest, MultipleMiceConnectionAndRemoval) {

    mChoreographer.setDisplayViewports(createViewports({DISPLAY_ID}));

    mChoreographer.setDefaultMouseDisplayId(DISPLAY_ID);

    setDefaultMouseDisplayId(DISPLAY_ID);



    // A mouse is connected, and the pointer is shown.

    mChoreographer.notifyInputDevicesChanged(
@@ -599,7 +603,7 @@ TEST_F(PointerChoreographerTest, MultipleMiceConnectionAndRemoval) { 


TEST_F(PointerChoreographerTest, UnrelatedChangeDoesNotUnfadePointer) {

    mChoreographer.setDisplayViewports(createViewports({DISPLAY_ID}));

    mChoreographer.setDefaultMouseDisplayId(DISPLAY_ID);

    setDefaultMouseDisplayId(DISPLAY_ID);

    mChoreographer.notifyInputDevicesChanged(

            {/*id=*/0,

             {generateTestDeviceInfo(DEVICE_ID, AINPUT_SOURCE_MOUSE,
@@ -628,7 +632,7 @@ TEST_F(PointerChoreographerTest, UnrelatedChangeDoesNotUnfadePointer) { 


TEST_F(PointerChoreographerTest, DisabledMouseConnected) {

    mChoreographer.setDisplayViewports(createViewports({DISPLAY_ID}));

    mChoreographer.setDefaultMouseDisplayId(DISPLAY_ID);

    setDefaultMouseDisplayId(DISPLAY_ID);

    InputDeviceInfo mouseDeviceInfo =

            generateTestDeviceInfo(DEVICE_ID, AINPUT_SOURCE_MOUSE, ui::LogicalDisplayId::INVALID);

    // Disable this mouse device.
@@ -641,7 +645,7 @@ TEST_F(PointerChoreographerTest, DisabledMouseConnected) { 


TEST_F(PointerChoreographerTest, MouseDeviceDisableLater) {

    mChoreographer.setDisplayViewports(createViewports({DISPLAY_ID}));

    mChoreographer.setDefaultMouseDisplayId(DISPLAY_ID);

    setDefaultMouseDisplayId(DISPLAY_ID);

    InputDeviceInfo mouseDeviceInfo =

            generateTestDeviceInfo(DEVICE_ID, AINPUT_SOURCE_MOUSE, ui::LogicalDisplayId::INVALID);
@@ -660,7 +664,7 @@ TEST_F(PointerChoreographerTest, MouseDeviceDisableLater) { 


TEST_F(PointerChoreographerTest, MultipleEnabledAndDisabledMiceConnectionAndRemoval) {

    mChoreographer.setDisplayViewports(createViewports({DISPLAY_ID}));

    mChoreographer.setDefaultMouseDisplayId(DISPLAY_ID);

    setDefaultMouseDisplayId(DISPLAY_ID);

    InputDeviceInfo disabledMouseDeviceInfo =

            generateTestDeviceInfo(DEVICE_ID, AINPUT_SOURCE_MOUSE, ui::LogicalDisplayId::INVALID);

    disabledMouseDeviceInfo.setEnabled(false);
@@ -1011,7 +1015,7 @@ TEST_F(PointerChoreographerTest, ShowTouchesOverridesUnspecifiedStylusIcon) { 
TEST_F(PointerChoreographerTest, StylusHoverEnterFadesMouseOnDisplay) {

    // Make sure there are PointerControllers for a mouse and a stylus.

    mChoreographer.setStylusPointerIconEnabled(true);

    mChoreographer.setDefaultMouseDisplayId(DISPLAY_ID);

    setDefaultMouseDisplayId(DISPLAY_ID);

    mChoreographer.notifyInputDevicesChanged(

            {/*id=*/0,

             {generateTestDeviceInfo(DEVICE_ID, AINPUT_SOURCE_MOUSE, ui::LogicalDisplayId::INVALID),
@@ -1406,7 +1410,7 @@ TEST_F(PointerChoreographerTest, WhenViewportSetLaterSetsViewportForAssociatedTo 


TEST_F(PointerChoreographerTest, SetsDefaultTouchpadViewportForPointerController) {

    mChoreographer.setDisplayViewports(createViewports({DISPLAY_ID}));

    mChoreographer.setDefaultMouseDisplayId(DISPLAY_ID);

    setDefaultMouseDisplayId(DISPLAY_ID);



    // For a touchpad event without a target display, default viewport should be set for

    // the PointerController.
@@ -1422,7 +1426,7 @@ TEST_F(PointerChoreographerTest, 
       WhenDefaultTouchpadDisplayChangesSetsDefaultTouchpadViewportForPointerController) {

    // Set one display as a default touchpad display and create PointerController.

    mChoreographer.setDisplayViewports(createViewports({DISPLAY_ID, ANOTHER_DISPLAY_ID}));

    mChoreographer.setDefaultMouseDisplayId(DISPLAY_ID);

    setDefaultMouseDisplayId(DISPLAY_ID);

    mChoreographer.notifyInputDevicesChanged(

            {/*id=*/0,

             {generateTestDeviceInfo(DEVICE_ID, AINPUT_SOURCE_MOUSE | AINPUT_SOURCE_TOUCHPAD,
@@ -1431,7 +1435,7 @@ TEST_F(PointerChoreographerTest, 
    firstDisplayPc->assertViewportSet(DISPLAY_ID);



    // Change default mouse display. Existing PointerController should be removed.

    mChoreographer.setDefaultMouseDisplayId(ANOTHER_DISPLAY_ID);

    setDefaultMouseDisplayId(ANOTHER_DISPLAY_ID);

    assertPointerControllerRemoved(firstDisplayPc);



    auto secondDisplayPc = assertPointerControllerCreated(ControllerType::MOUSE);
@@ -1439,7 +1443,7 @@ TEST_F(PointerChoreographerTest, 
}



TEST_F(PointerChoreographerTest, TouchpadCallsNotifyPointerDisplayIdChanged) {

    mChoreographer.setDefaultMouseDisplayId(DISPLAY_ID);

    setDefaultMouseDisplayId(DISPLAY_ID);

    mChoreographer.setDisplayViewports(createViewports({DISPLAY_ID}));

    mChoreographer.notifyInputDevicesChanged(

            {/*id=*/0,
@@ -1451,7 +1455,7 @@ TEST_F(PointerChoreographerTest, TouchpadCallsNotifyPointerDisplayIdChanged) { 
}



TEST_F(PointerChoreographerTest, WhenViewportIsSetLaterTouchpadCallsNotifyPointerDisplayIdChanged) {

    mChoreographer.setDefaultMouseDisplayId(DISPLAY_ID);

    setDefaultMouseDisplayId(DISPLAY_ID);

    mChoreographer.notifyInputDevicesChanged(

            {/*id=*/0,

             {generateTestDeviceInfo(DEVICE_ID, AINPUT_SOURCE_MOUSE | AINPUT_SOURCE_TOUCHPAD,
@@ -1464,7 +1468,7 @@ TEST_F(PointerChoreographerTest, WhenViewportIsSetLaterTouchpadCallsNotifyPointe 
}



TEST_F(PointerChoreographerTest, WhenTouchpadIsRemovedCallsNotifyPointerDisplayIdChanged) {

    mChoreographer.setDefaultMouseDisplayId(DISPLAY_ID);

    setDefaultMouseDisplayId(DISPLAY_ID);

    mChoreographer.setDisplayViewports(createViewports({DISPLAY_ID}));

    mChoreographer.notifyInputDevicesChanged(

            {/*id=*/0,
@@ -1484,7 +1488,7 @@ TEST_F(PointerChoreographerTest, 
    mChoreographer.setDisplayViewports(createViewports({DISPLAY_ID, ANOTHER_DISPLAY_ID}));



    // Set one viewport as a default mouse display ID.

    mChoreographer.setDefaultMouseDisplayId(DISPLAY_ID);

    setDefaultMouseDisplayId(DISPLAY_ID);

    mChoreographer.notifyInputDevicesChanged(

            {/*id=*/0,

             {generateTestDeviceInfo(DEVICE_ID, AINPUT_SOURCE_MOUSE | AINPUT_SOURCE_TOUCHPAD,
@@ -1494,7 +1498,7 @@ TEST_F(PointerChoreographerTest, 


    // Set another viewport as a default mouse display ID. ui::LogicalDisplayId::INVALID will be

    // notified before a touchpad event.

    mChoreographer.setDefaultMouseDisplayId(ANOTHER_DISPLAY_ID);

    setDefaultMouseDisplayId(ANOTHER_DISPLAY_ID);

    assertPointerControllerRemoved(firstDisplayPc);



    assertPointerControllerCreated(ControllerType::MOUSE);
@@ -1503,7 +1507,7 @@ TEST_F(PointerChoreographerTest, 


TEST_F(PointerChoreographerTest, TouchpadMovesPointerAndReturnsNewArgs) {

    mChoreographer.setDisplayViewports(createViewports({DISPLAY_ID}));

    mChoreographer.setDefaultMouseDisplayId(DISPLAY_ID);

    setDefaultMouseDisplayId(DISPLAY_ID);

    mChoreographer.notifyInputDevicesChanged(

            {/*id=*/0,

             {generateTestDeviceInfo(DEVICE_ID, AINPUT_SOURCE_MOUSE | AINPUT_SOURCE_TOUCHPAD,
@@ -1533,7 +1537,7 @@ TEST_F(PointerChoreographerTest, TouchpadMovesPointerAndReturnsNewArgs) { 


TEST_F(PointerChoreographerTest, TouchpadAddsPointerPositionToTheCoords) {

    mChoreographer.setDisplayViewports(createViewports({DISPLAY_ID}));

    mChoreographer.setDefaultMouseDisplayId(DISPLAY_ID);

    setDefaultMouseDisplayId(DISPLAY_ID);

    mChoreographer.notifyInputDevicesChanged(

            {/*id=*/0,

             {generateTestDeviceInfo(DEVICE_ID, AINPUT_SOURCE_MOUSE | AINPUT_SOURCE_TOUCHPAD,
@@ -1610,7 +1614,7 @@ TEST_F(PointerChoreographerTest, 
       AssociatedTouchpadMovesPointerOnAssociatedDisplayAndDoesNotMovePointerOnDefaultDisplay) {

    // Add two displays and set one to default.

    mChoreographer.setDisplayViewports(createViewports({DISPLAY_ID, ANOTHER_DISPLAY_ID}));

    mChoreographer.setDefaultMouseDisplayId(DISPLAY_ID);

    setDefaultMouseDisplayId(DISPLAY_ID);



    // Add two devices, one unassociated and the other associated with non-default mouse display.

    mChoreographer.notifyInputDevicesChanged(
@@ -1651,7 +1655,7 @@ TEST_F(PointerChoreographerTest, 


TEST_F(PointerChoreographerTest, DoesNotMovePointerForTouchpadSource) {

    mChoreographer.setDisplayViewports(createViewports({DISPLAY_ID}));

    mChoreographer.setDefaultMouseDisplayId(DISPLAY_ID);

    setDefaultMouseDisplayId(DISPLAY_ID);

    mChoreographer.notifyInputDevicesChanged(

            {/*id=*/0,

             {generateTestDeviceInfo(DEVICE_ID, AINPUT_SOURCE_MOUSE | AINPUT_SOURCE_TOUCHPAD,
@@ -1688,7 +1692,7 @@ TEST_F(PointerChoreographerTest, DoesNotMovePointerForTouchpadSource) { 


TEST_F(PointerChoreographerTest, WhenPointerCaptureEnabledTouchpadHidesPointer) {

    mChoreographer.setDisplayViewports(createViewports({DISPLAY_ID}));

    mChoreographer.setDefaultMouseDisplayId(DISPLAY_ID);

    setDefaultMouseDisplayId(DISPLAY_ID);

    mChoreographer.notifyInputDevicesChanged(

            {/*id=*/0,

             {generateTestDeviceInfo(DEVICE_ID, AINPUT_SOURCE_MOUSE | AINPUT_SOURCE_TOUCHPAD,
@@ -1708,7 +1712,7 @@ TEST_F(PointerChoreographerTest, WhenPointerCaptureEnabledTouchpadHidesPointer) 
TEST_F(PointerChoreographerTest, SetsPointerIconForMouse) {

    // Make sure there is a PointerController.

    mChoreographer.setDisplayViewports(createViewports({DISPLAY_ID}));

    mChoreographer.setDefaultMouseDisplayId(DISPLAY_ID);

    setDefaultMouseDisplayId(DISPLAY_ID);

    mChoreographer.notifyInputDevicesChanged(

            {/*id=*/0,

             {generateTestDeviceInfo(DEVICE_ID, AINPUT_SOURCE_MOUSE,
@@ -1724,7 +1728,7 @@ TEST_F(PointerChoreographerTest, SetsPointerIconForMouse) { 
TEST_F(PointerChoreographerTest, DoesNotSetMousePointerIconForWrongDisplayId) {

    // Make sure there is a PointerController.

    mChoreographer.setDisplayViewports(createViewports({DISPLAY_ID}));

    mChoreographer.setDefaultMouseDisplayId(DISPLAY_ID);

    setDefaultMouseDisplayId(DISPLAY_ID);

    mChoreographer.notifyInputDevicesChanged(

            {/*id=*/0,

             {generateTestDeviceInfo(DEVICE_ID, AINPUT_SOURCE_MOUSE,
@@ -1741,7 +1745,7 @@ TEST_F(PointerChoreographerTest, DoesNotSetMousePointerIconForWrongDisplayId) { 
TEST_F(PointerChoreographerTest, DoesNotSetPointerIconForWrongDeviceId) {

    // Make sure there is a PointerController.

    mChoreographer.setDisplayViewports(createViewports({DISPLAY_ID}));

    mChoreographer.setDefaultMouseDisplayId(DISPLAY_ID);

    setDefaultMouseDisplayId(DISPLAY_ID);

    mChoreographer.notifyInputDevicesChanged(

            {/*id=*/0,

             {generateTestDeviceInfo(DEVICE_ID, AINPUT_SOURCE_MOUSE,
@@ -1758,7 +1762,7 @@ TEST_F(PointerChoreographerTest, DoesNotSetPointerIconForWrongDeviceId) { 
TEST_F(PointerChoreographerTest, SetsCustomPointerIconForMouse) {

    // Make sure there is a PointerController.

    mChoreographer.setDisplayViewports(createViewports({DISPLAY_ID}));

    mChoreographer.setDefaultMouseDisplayId(DISPLAY_ID);

    setDefaultMouseDisplayId(DISPLAY_ID);

    mChoreographer.notifyInputDevicesChanged(

            {/*id=*/0,

             {generateTestDeviceInfo(DEVICE_ID, AINPUT_SOURCE_MOUSE,
@@ -1782,7 +1786,7 @@ TEST_F(PointerChoreographerTest, SetsCustomPointerIconForMouse) { 
TEST_F(PointerChoreographerTest, SetsPointerIconForMouseOnTwoDisplays) {

    // Make sure there are two PointerControllers on different displays.

    mChoreographer.setDisplayViewports(createViewports({DISPLAY_ID, ANOTHER_DISPLAY_ID}));

    mChoreographer.setDefaultMouseDisplayId(DISPLAY_ID);

    setDefaultMouseDisplayId(DISPLAY_ID);

    mChoreographer.notifyInputDevicesChanged(

            {/*id=*/0,

             {generateTestDeviceInfo(DEVICE_ID, AINPUT_SOURCE_MOUSE, ui::LogicalDisplayId::INVALID),
@@ -1806,7 +1810,7 @@ TEST_F(PointerChoreographerTest, SetsPointerIconForMouseOnTwoDisplays) { 


TEST_F(PointerChoreographerTest, A11yPointerMotionFilterMouse) {

    mChoreographer.setDisplayViewports(createViewports({DISPLAY_ID}));

    mChoreographer.setDefaultMouseDisplayId(DISPLAY_ID);

    setDefaultMouseDisplayId(DISPLAY_ID);

    mChoreographer.notifyInputDevicesChanged(

            {/*id=*/0,

             {generateTestDeviceInfo(DEVICE_ID, AINPUT_SOURCE_MOUSE,
@@ -1840,7 +1844,7 @@ TEST_F(PointerChoreographerTest, A11yPointerMotionFilterMouse) { 


TEST_F(PointerChoreographerTest, A11yPointerMotionFilterTouchpad) {

    mChoreographer.setDisplayViewports(createViewports({DISPLAY_ID}));

    mChoreographer.setDefaultMouseDisplayId(DISPLAY_ID);

    setDefaultMouseDisplayId(DISPLAY_ID);

    mChoreographer.notifyInputDevicesChanged(

            {/*id=*/0,

             {generateTestDeviceInfo(DEVICE_ID, AINPUT_SOURCE_MOUSE | AINPUT_SOURCE_TOUCHPAD,
@@ -2238,7 +2242,7 @@ TEST_P(StylusTestFixture, SetsPointerIconForMouseAndStylus) { 


    // Make sure there are PointerControllers for a mouse and a stylus.

    mChoreographer.setStylusPointerIconEnabled(true);

    mChoreographer.setDefaultMouseDisplayId(DISPLAY_ID);

    setDefaultMouseDisplayId(DISPLAY_ID);

    mChoreographer.notifyInputDevicesChanged(

            {/*id=*/0,

             {generateTestDeviceInfo(DEVICE_ID, AINPUT_SOURCE_MOUSE, ui::LogicalDisplayId::INVALID),
@@ -2273,7 +2277,7 @@ TEST_P(StylusTestFixture, SetsPointerIconForMouseAndStylus) { 
TEST_F(PointerChoreographerTest, SetPointerIconVisibilityHidesPointerOnDisplay) {

    // Make sure there are two PointerControllers on different displays.

    mChoreographer.setDisplayViewports(createViewports({DISPLAY_ID, ANOTHER_DISPLAY_ID}));

    mChoreographer.setDefaultMouseDisplayId(DISPLAY_ID);

    setDefaultMouseDisplayId(DISPLAY_ID);

    mChoreographer.notifyInputDevicesChanged(

            {/*id=*/0,

             {generateTestDeviceInfo(DEVICE_ID, AINPUT_SOURCE_MOUSE, ui::LogicalDisplayId::INVALID),
@@ -2327,7 +2331,7 @@ TEST_F(PointerChoreographerTest, SetPointerIconVisibilityHidesPointerOnDisplay) 


TEST_F(PointerChoreographerTest, SetPointerIconVisibilityHidesPointerWhenDeviceConnected) {

    mChoreographer.setDisplayViewports(createViewports({DISPLAY_ID}));

    mChoreographer.setDefaultMouseDisplayId(DISPLAY_ID);

    setDefaultMouseDisplayId(DISPLAY_ID);



    // Hide the pointer on the display, and then connect the mouse.

    mChoreographer.setPointerIconVisibility(DISPLAY_ID, false);
@@ -2344,7 +2348,7 @@ TEST_F(PointerChoreographerTest, SetPointerIconVisibilityHidesPointerWhenDeviceC 


TEST_F(PointerChoreographerTest, SetPointerIconVisibilityHidesPointerForTouchpad) {

    mChoreographer.setDisplayViewports(createViewports({DISPLAY_ID}));

    mChoreographer.setDefaultMouseDisplayId(DISPLAY_ID);

    setDefaultMouseDisplayId(DISPLAY_ID);



    // Hide the pointer on the display.

    mChoreographer.setPointerIconVisibility(DISPLAY_ID, false);
@@ -2393,7 +2397,7 @@ TEST_P(StylusTestFixture, SetPointerIconVisibilityHidesPointerForStylus) { 


TEST_F(PointerChoreographerTest, DrawingTabletCanReportMouseEvent) {

    mChoreographer.setDisplayViewports(createViewports({DISPLAY_ID}));

    mChoreographer.setDefaultMouseDisplayId(DISPLAY_ID);

    setDefaultMouseDisplayId(DISPLAY_ID);



    mChoreographer.notifyInputDevicesChanged(

            {/*id=*/0,
@@ -2420,7 +2424,7 @@ TEST_F(PointerChoreographerTest, DrawingTabletCanReportMouseEvent) { 


TEST_F(PointerChoreographerTest, MultipleDrawingTabletsReportMouseEvents) {

    mChoreographer.setDisplayViewports(createViewports({DISPLAY_ID}));

    mChoreographer.setDefaultMouseDisplayId(DISPLAY_ID);

    setDefaultMouseDisplayId(DISPLAY_ID);



    // First drawing tablet is added

    mChoreographer.notifyInputDevicesChanged(
@@ -2468,7 +2472,7 @@ TEST_F(PointerChoreographerTest, MultipleDrawingTabletsReportMouseEvents) { 


TEST_F(PointerChoreographerTest, MouseAndDrawingTabletReportMouseEvents) {

    mChoreographer.setDisplayViewports(createViewports({DISPLAY_ID}));

    mChoreographer.setDefaultMouseDisplayId(DISPLAY_ID);

    setDefaultMouseDisplayId(DISPLAY_ID);



    // Mouse and drawing tablet connected

    mChoreographer.notifyInputDevicesChanged(
@@ -2787,8 +2791,7 @@ TEST_P(PointerChoreographerDisplayTopologyTestFixture, PointerChoreographerDispl 
                 destinationDisplay, destinationPosition] = GetParam();



    mChoreographer.setDisplayViewports(mViewports);

    mChoreographer.setDefaultMouseDisplayId(

            PointerChoreographerDisplayTopologyTestFixture::DISPLAY_CENTER_ID);

    setDefaultMouseDisplayId(PointerChoreographerDisplayTopologyTestFixture::DISPLAY_CENTER_ID);

    mChoreographer.setDisplayTopology(mTopology);



    mChoreographer.notifyInputDevicesChanged(