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

Commit 27ebe80a authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11286711 from e58a9ced to 24Q2-release 

Change-Id: If7f66f0c89034dad1c665d06194f5299353ed781
parents 0b016bb1 e58a9ced

cmds/servicemanager/servicemanager.rc

+1 −1
Original line number Diff line number Diff line
@@ -11,5 +11,5 @@ service servicemanager /system/bin/servicemanager 
    onrestart class_restart --only-enabled main

    onrestart class_restart --only-enabled hal

    onrestart class_restart --only-enabled early_hal

    task_profiles ServiceCapacityLow

    task_profiles ProcessCapacityHigh

    shutdown critical

services/inputflinger/PointerChoreographer.cpp

+1 −0
Original line number Diff line number Diff line
@@ -222,6 +222,7 @@ void PointerChoreographer::processStylusHoverEventLocked(const NotifyMotionArgs& 
    pc.setPosition(x, y);

    if (args.action == AMOTION_EVENT_ACTION_HOVER_EXIT) {

        pc.fade(PointerControllerInterface::Transition::IMMEDIATE);

        pc.updatePointerIcon(PointerIconStyle::TYPE_NOT_SPECIFIED);

    } else {

        pc.unfade(PointerControllerInterface::Transition::IMMEDIATE);

    }

services/inputflinger/reader/mapper/TouchpadInputMapper.cpp

+2 −0
Original line number Diff line number Diff line
@@ -399,6 +399,8 @@ std::list<NotifyArgs> TouchpadInputMapper::reconfigure(nsecs_t when, 
                    : FloatRect{0, 0, 0, 0};

        }

        mGestureConverter.setBoundsInLogicalDisplay(*boundsInLogicalDisplay);



        bumpGeneration();

    }

    if (!changes.any() || changes.test(InputReaderConfiguration::Change::TOUCHPAD_SETTINGS)) {

        mPropertyProvider.getProperty("Use Custom Touchpad Pointer Accel Curve")

services/inputflinger/tests/PointerChoreographer_test.cpp

+9 −0
Original line number Diff line number Diff line
@@ -1447,6 +1447,15 @@ TEST_F(PointerChoreographerTest, SetsPointerIconForStylus) { 
    ASSERT_FALSE(mChoreographer.setPointerIcon(PointerIconStyle::TYPE_TEXT, DISPLAY_ID,

                                               SECOND_DEVICE_ID));

    pc->assertPointerIconNotSet();



    // The stylus stops hovering. This should cause the icon to be reset.

    mChoreographer.notifyMotion(

            MotionArgsBuilder(AMOTION_EVENT_ACTION_HOVER_EXIT, AINPUT_SOURCE_STYLUS)

                    .pointer(STYLUS_POINTER)

                    .deviceId(DEVICE_ID)

                    .displayId(DISPLAY_ID)

                    .build());

    pc->assertPointerIconSet(PointerIconStyle::TYPE_NOT_SPECIFIED);

}



TEST_F(PointerChoreographerTest, SetsCustomPointerIconForStylus) {