From 7c94b7a9ef3b37e31d320e351caf0fe058e20bdf Mon Sep 17 00:00:00 2001 From: Fiona Campbell Date: Wed, 10 Aug 2022 14:18:52 +0000 Subject: Ensure displayId isn't translated String.format() will also translate some strings. When the phone's language is set to something that doesn't use the Western Arabic numeral system, these numbers are translated as well, which means that the display device config files cannot be found, as they are described by their display id. This cl ensures the Locale is the same as the root locale when calling String.format() for the ddc path, meaning they won't get translated. Bug: 241871531 Test: adb shell dumpsys display | grep DisplayDeviceConfig Change-Id: I10b022c04c743f2eb287426a8a9026cc0c75c276 --- .../core/java/com/android/server/display/DisplayDeviceConfig.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/display/DisplayDeviceConfig.java b/services/core/java/com/android/server/display/DisplayDeviceConfig.java index b5aa7b14792b..3d7c7e230e8b 100644 --- a/services/core/java/com/android/server/display/DisplayDeviceConfig.java +++ b/services/core/java/com/android/server/display/DisplayDeviceConfig.java @@ -65,6 +65,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.List; +import java.util.Locale; import javax.xml.datatype.DatatypeConfigurationException; @@ -669,8 +670,8 @@ public class DisplayDeviceConfig { private static DisplayDeviceConfig getConfigFromSuffix(Context context, File baseDirectory, String suffixFormat, long idNumber) { - final String suffix = String.format(suffixFormat, idNumber); - final String filename = String.format(CONFIG_FILE_FORMAT, suffix); + final String suffix = String.format(Locale.ROOT, suffixFormat, idNumber); + final String filename = String.format(Locale.ROOT, CONFIG_FILE_FORMAT, suffix); final File filePath = Environment.buildPath( baseDirectory, ETC_DIR, DISPLAY_CONFIG_DIR, filename); final DisplayDeviceConfig config = new DisplayDeviceConfig(context); -- cgit v1.2.3-59-g8ed1b