From aaeccfbe56ee774f43b03dc960e2b7935d17bdb7 Mon Sep 17 00:00:00 2001 From: Will Brockman Date: Tue, 17 Mar 2020 13:17:29 -0400 Subject: Fix UIEvent ID collision. An accidental ID collision in volume dialog logging had RINGER_MODE_NORMAL and ZEN_MODE_OFF both on ID 156. Move both to new IDs (334, 335). Fixes: 151632114 Test: atest SystemUITests Change-Id: Ic24fd3ac30721c93eae9f0b164c8a2a7d3aee118 --- packages/SystemUI/src/com/android/systemui/volume/Events.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/volume/Events.java b/packages/SystemUI/src/com/android/systemui/volume/Events.java index e1210011c7a4..6131e3b504af 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/Events.java +++ b/packages/SystemUI/src/com/android/systemui/volume/Events.java @@ -238,7 +238,7 @@ public class Events { @UiEvent(doc = "The ringer mode was toggled to vibrate") RINGER_MODE_VIBRATE(155), @UiEvent(doc = "The ringer mode was toggled to normal") - RINGER_MODE_NORMAL(156), + RINGER_MODE_NORMAL(334), @UiEvent(doc = "USB Overheat alarm was raised") USB_OVERHEAT_ALARM(160), @UiEvent(doc = "USB Overheat alarm was dismissed") @@ -293,7 +293,7 @@ public class Events { public enum ZenModeEvent implements UiEventLogger.UiEventEnum { INVALID(0), @UiEvent(doc = "Zen (do not disturb) mode was toggled to off") - ZEN_MODE_OFF(156), + ZEN_MODE_OFF(335), @UiEvent(doc = "Zen (do not disturb) mode was toggled to important interruptions only") ZEN_MODE_IMPORTANT_ONLY(157), @UiEvent(doc = "Zen (do not disturb) mode was toggled to alarms only") -- cgit v1.2.3-59-g8ed1b