Merge "Fix jank trigger name on non-english locales" into sc-dev

This commit is contained in:
Marcin Oczeretko
2021-06-14 13:28:03 +00:00
committed by Android (Google) Code Review

View File

@@ -78,6 +78,7 @@ import com.android.internal.util.PerfettoTrigger;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.util.Locale;
import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@@ -713,7 +714,8 @@ public class InteractionJankMonitor {
} }
public String getPerfettoTrigger() { 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() { public String getName() {