From 2ac1fd3c9dcc6785930869ecc995920f3bca63e8 Mon Sep 17 00:00:00 2001 From: Jae Seo Date: Thu, 16 Jul 2015 17:48:55 -0700 Subject: [PATCH] TIF: Avoid generating locale dependent input IDs Bug: 22519551 Change-Id: Id818f075fa4863b6e1a6f707e0debe8f08973f25 --- media/java/android/media/tv/TvInputInfo.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/media/java/android/media/tv/TvInputInfo.java b/media/java/android/media/tv/TvInputInfo.java index ce72c2fa4a25d..a3d748efafd27 100644 --- 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()); }