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

Commit b315fca8 authored by Gus Prevas's avatar Gus Prevas
Browse files

Fixes GestureLauncherService triggering on long press. 

This change modifies the logic in GestureLauncherService which handles
key down events on the power key so that it ignores events associated
with a long press.  This prevents the camera from being launched when
a long press occurs within the double-tap threshold, such as when it's
generated by ADB.

Test: atest GestureLauncherServiceTest
Change-Id: I174c338ec3f46cf338ad417bfc551729e4ecd516
Fixes: 116697919
parent cda0e83f

services/core/java/com/android/server/GestureLauncherService.java

+6 −0
Original line number Diff line number Diff line
@@ -356,6 +356,12 @@ public class GestureLauncherService extends SystemService { 


    public boolean interceptPowerKeyDown(KeyEvent event, boolean interactive,

            MutableBoolean outLaunched) {

        if (event.isLongPress()) {

            // Long presses are sent as a second key down. If the long press threshold is set lower

            // than the double tap of sequence interval thresholds, this could cause false double

            // taps or consecutive taps, so we want to ignore the long press event.

            return false;

        }

        boolean launched = false;

        boolean intercept = false;

        long powerTapInterval;

services/tests/servicestests/src/com/android/server/GestureLauncherServiceTest.java

+47 −0
Original line number Diff line number Diff line
@@ -73,6 +73,9 @@ public class GestureLauncherServiceTest { 
    private static final int IGNORED_ACTION = 13;

    private static final int IGNORED_CODE = 1999;

    private static final int IGNORED_REPEAT = 42;

    private static final int IGNORED_META_STATE = 0;

    private static final int IGNORED_DEVICE_ID = 0;

    private static final int IGNORED_SCANCODE = 0;



    private @Mock Context mContext;

    private @Mock Resources mResources;
@@ -368,6 +371,50 @@ public class GestureLauncherServiceTest { 
        assertEquals(2, tapCounts.get(1).intValue());

    }



    @Test

    public void testInterceptPowerKeyDown_longpress() {

        withCameraDoubleTapPowerEnableConfigValue(true);

        withCameraDoubleTapPowerDisableSettingValue(0);

        mGestureLauncherService.updateCameraDoubleTapPowerEnabled();

        withUserSetupCompleteValue(true);



        long eventTime = INITIAL_EVENT_TIME_MILLIS;

        KeyEvent keyEvent = new KeyEvent(IGNORED_DOWN_TIME, eventTime, IGNORED_ACTION, IGNORED_CODE,

                IGNORED_REPEAT);

        boolean interactive = true;

        MutableBoolean outLaunched = new MutableBoolean(true);

        boolean intercepted = mGestureLauncherService.interceptPowerKeyDown(keyEvent, interactive,

                outLaunched);

        assertFalse(intercepted);

        assertFalse(outLaunched.value);



        final long interval = GestureLauncherService.CAMERA_POWER_DOUBLE_TAP_MAX_TIME_MS - 1;

        eventTime += interval;

        keyEvent = new KeyEvent(IGNORED_DOWN_TIME, eventTime, IGNORED_ACTION, IGNORED_CODE,

                IGNORED_REPEAT, IGNORED_META_STATE, IGNORED_DEVICE_ID, IGNORED_SCANCODE,

                KeyEvent.FLAG_LONG_PRESS);

        outLaunched.value = false;

        intercepted = mGestureLauncherService.interceptPowerKeyDown(keyEvent, interactive,

                outLaunched);

        assertFalse(intercepted);

        assertFalse(outLaunched.value);



        verify(mMetricsLogger, never())

                .action(eq(MetricsEvent.ACTION_DOUBLE_TAP_POWER_CAMERA_GESTURE), anyInt());



        final ArgumentCaptor<Integer> intervalCaptor = ArgumentCaptor.forClass(Integer.class);

        verify(mMetricsLogger, times(1)).histogram(

                eq("power_double_tap_interval"), intervalCaptor.capture());

        List<Integer> intervals = intervalCaptor.getAllValues();

        assertEquals((int) INITIAL_EVENT_TIME_MILLIS, intervals.get(0).intValue());



        final ArgumentCaptor<Integer> tapCountCaptor = ArgumentCaptor.forClass(Integer.class);

        verify(mMetricsLogger, times(1)).histogram(

                eq("power_consecutive_short_tap_count"), tapCountCaptor.capture());

        List<Integer> tapCounts = tapCountCaptor.getAllValues();

        assertEquals(1, tapCounts.get(0).intValue());

    }



    @Test

    public void

    testInterceptPowerKeyDown_intervalInBoundsCameraPowerGestureOnInteractiveSetupIncomplete() {