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

Commit f9926486 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13853765

Change-Id: I6e30b783c2b13740ebe733c13425032f0cfe5c2e
parents 90ae4d54 58903511

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);