Merge "TIF: Avoid generating locale dependent input IDs" into mnc-dev

2015-07-17 01:07:00 +00:00
parent 86647987c3 2ac1fd3c9d
commit d19ed4c16d
1 changed files with 2 additions and 1 deletions
--- a/media/java/android/media/tv/TvInputInfo.java
+++ b/media/java/android/media/tv/TvInputInfo.java
@@ -49,6 +49,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Set;

@@ -611,7 +612,7 @@ public final class TvInputInfo implements Parcelable {
        String format = DELIMITER_INFO_IN_ID + PREFIX_HDMI_DEVICE
                + "%0" + LENGTH_HDMI_PHYSICAL_ADDRESS + "X"
                + "%0" + LENGTH_HDMI_DEVICE_ID + "X";
-        return name.flattenToShortString() + String.format(format,
+        return name.flattenToShortString() + String.format(Locale.ENGLISH, format,
                deviceInfo.getPhysicalAddress(), deviceInfo.getId());
    }