summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/java/android/app/ActivityThread.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index 183783bdf309..9a90df93b2cd 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -263,6 +263,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import java.util.Objects;
import java.util.TimeZone;
@@ -3033,7 +3034,7 @@ public final class ActivityThread extends ClientTransactionHandler
"%13s %8s %8s %8s %8s %8s %8s %8s %8s";
private static final String ONE_COUNT_COLUMN = "%21s %8d";
private static final String TWO_COUNT_COLUMNS = "%21s %8d %21s %8d";
- private static final String THREE_COUNT_COLUMNS = "%21s %8d %21s %8s %21s %8d";
+ private static final String THREE_COUNT_COLUMNS = "%21s %8d %21s %8d %21s %8d";
private static final String TWO_COUNT_COLUMN_HEADER = "%21s %8s %21s %8s";
private static final String ONE_ALT_COUNT_COLUMN = "%21s %8s %21s %8d";
@@ -3041,7 +3042,7 @@ public final class ActivityThread extends ClientTransactionHandler
private static final int ACTIVITY_THREAD_CHECKIN_VERSION = 4;
static void printRow(PrintWriter pw, String format, Object...objs) {
- pw.println(String.format(format, objs));
+ pw.println(String.format(Locale.US, format, objs));
}
@NeverCompile