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

Commit 58903511 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove last references to "Panic gesture"" into sc-dev

parents 483ba791 96e86b47

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

+2 −2
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ public class GestureLauncherService extends SystemService { 
        GESTURE_CAMERA_DOUBLE_TAP_POWER(660),



        @UiEvent(doc = "The user multi-tapped power quickly enough to signal an emergency.")

        GESTURE_PANIC_TAP_POWER(661);

        GESTURE_EMERGENCY_TAP_POWER(661);



        private final int mId;
@@ -508,7 +508,7 @@ public class GestureLauncherService extends SystemService { 
        } else if (launchEmergencyGesture) {

            Slog.i(TAG, "Emergency gesture detected, launching.");

            launchEmergencyGesture = handleEmergencyGesture();

            mUiEventLogger.log(GestureLauncherEvent.GESTURE_PANIC_TAP_POWER);

            mUiEventLogger.log(GestureLauncherEvent.GESTURE_EMERGENCY_TAP_POWER);

        }

        mMetricsLogger.histogram("power_consecutive_short_tap_count",

                mPowerButtonSlowConsecutiveTaps);

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

+2 −2
Original line number Diff line number Diff line
@@ -524,7 +524,7 @@ public class GestureLauncherServiceTest { 
        assertTrue(outLaunched.value);



        verify(mUiEventLogger, times(1))

                .log(GestureLauncherService.GestureLauncherEvent.GESTURE_PANIC_TAP_POWER);

                .log(GestureLauncherService.GestureLauncherEvent.GESTURE_EMERGENCY_TAP_POWER);

        verify(mStatusBarManagerInternal).onEmergencyActionLaunchGestureDetected();



        final ArgumentCaptor<Integer> intervalCaptor = ArgumentCaptor.forClass(Integer.class);
@@ -578,7 +578,7 @@ public class GestureLauncherServiceTest { 
        assertTrue(intercepted);



        verify(mUiEventLogger, times(1))

                .log(GestureLauncherService.GestureLauncherEvent.GESTURE_PANIC_TAP_POWER);

                .log(GestureLauncherService.GestureLauncherEvent.GESTURE_EMERGENCY_TAP_POWER);

        verify(mStatusBarManagerInternal).onEmergencyActionLaunchGestureDetected();



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