Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove last references to "Panic gesture"

Browse Source 
The name "panic" is replaced with Emergency (emergency sos), so we
update the name of the log.

Test: none
Fixes: 169175022
Change-Id: Ieab93cc88bc1dedeae95b06671bcac10ce7b1754
This commit is contained in:
Matthew Fritze
2021-03-12 08:23:26 -08:00
parent 943a2392a8
commit 96e86b477e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/GestureLauncherService.java
View File

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

4
services/tests/servicestests/src/com/android/server/GestureLauncherServiceTest.java
View File

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