Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e09c2fb authored by Marcin Oczeretko's avatar Marcin Oczeretko Committed by Automerger Merge Worker
Browse files

Merge "Fix jank trigger name on non-english locales" into sc-dev am: 7c6032d0 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14920937

Change-Id: Ifbd58f49cba8c298255fc701c8242cc35ea00c44
parents bea2b82c 7c6032d0

core/java/com/android/internal/jank/InteractionJankMonitor.java

+3 −1
Original line number Diff line number Diff line
@@ -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() {