Merge ab/6749736 in stage.

Bug: 167233921
Merged-In: I84eced3ed42e5f2b6797c19eb20f874e974b667a
Change-Id: I1412686b5772061a1ec5c0375a5b738287da5559

1 files changed, 5 insertions, 3 deletions

diff --git a/android/WALT/app/src/main/java/org/chromium/latency/walt/programmer/FirmwareImage.java b/android/WALT/app/src/main/java/org/chromium/latency/walt/programmer/FirmwareImage.java
index d2feb01..0f8b1ef 100644
--- a/android/WALT/app/src/main/java/org/chromium/latency/walt/programmer/FirmwareImage.java
+++ b/android/WALT/app/src/main/java/org/chromium/latency/walt/programmer/FirmwareImage.java
@@ -24,6 +24,7 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.text.ParseException;
 import java.util.Arrays;
+import java.util.Locale;
 
 class FirmwareImage {
     private static final String TAG = "FirmwareImage";
@@ -89,7 +90,8 @@ class FirmwareImage {
                 return;
             }
             default: {
-                throw new ParseException(String.format("Unknown code '%x'", code), cur);
+                throw new ParseException(String.format(
+                    Locale.US, "Unknown code '%x'", code), cur);
             }
         }
     }
@@ -119,8 +121,8 @@ class FirmwareImage {
                 dest[addr + i] = parseByte(line, pos + i * 2);
                 mask[addr + i] = true;
             } catch (ArrayIndexOutOfBoundsException e) {
-                throw new ParseException(String.format("Address '%x' out of range", addr + i),
-                        pos + i * 2);
+                throw new ParseException(String.format(Locale.US,
+                    "Address '%x' out of range", addr + i), pos + i * 2);
             }
         }
     }