From f98fd1a7c80f0d6931ba9445a573f35227e0cec0 Mon Sep 17 00:00:00 2001 From: Marcin Oczeretko Date: Wed, 9 Jun 2021 18:59:13 +0100 Subject: [PATCH] Fix jank trigger name on non-english locales Specify en-us locale when calling string.format to generate the trigger name. Bug: b/190614325 Test: build Change-Id: I9f83dd0d7cacafa683884d2551f48ac3cc19ac89 --- .../com/android/internal/jank/InteractionJankMonitor.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/java/com/android/internal/jank/InteractionJankMonitor.java b/core/java/com/android/internal/jank/InteractionJankMonitor.java index 28b325b15b9c9..26d6a0c74b08e 100644 --- a/core/java/com/android/internal/jank/InteractionJankMonitor.java +++ b/core/java/com/android/internal/jank/InteractionJankMonitor.java @@ -78,6 +78,7 @@ import com.android.internal.util.PerfettoTrigger; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import java.util.Locale; import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.TimeUnit; @@ -713,7 +714,8 @@ public class InteractionJankMonitor { } public String getPerfettoTrigger() { - return String.format("com.android.telemetry.interaction-jank-monitor-%d", mCujType); + return String.format(Locale.US, "com.android.telemetry.interaction-jank-monitor-%d", + mCujType); } public String getName() {