From 96e86b477e2536f3dc53a61bc809847a92a5960d Mon Sep 17 00:00:00 2001 From: Matthew Fritze Date: Fri, 12 Mar 2021 08:23:26 -0800 Subject: [PATCH] Remove last references to "Panic gesture" The name "panic" is replaced with Emergency (emergency sos), so we update the name of the log. Test: none Fixes: 169175022 Change-Id: Ieab93cc88bc1dedeae95b06671bcac10ce7b1754 --- .../core/java/com/android/server/GestureLauncherService.java | 4 ++-- .../src/com/android/server/GestureLauncherServiceTest.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/services/core/java/com/android/server/GestureLauncherService.java b/services/core/java/com/android/server/GestureLauncherService.java index bab6deb812a7a..af791cb2cfcbd 100644 --- a/services/core/java/com/android/server/GestureLauncherService.java +++ b/services/core/java/com/android/server/GestureLauncherService.java @@ -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); diff --git a/services/tests/servicestests/src/com/android/server/GestureLauncherServiceTest.java b/services/tests/servicestests/src/com/android/server/GestureLauncherServiceTest.java index 6814c050a845a..2eb9e34b3fd06 100644 --- a/services/tests/servicestests/src/com/android/server/GestureLauncherServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/GestureLauncherServiceTest.java @@ -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 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 intervalCaptor = ArgumentCaptor.forClass(Integer.class);