commit 7c94b7a9ef3b37e31d320e351caf0fe058e20bdf
author Fiona Campbell <flc@google.com> Wed Aug 10 14:18:52 2022 +0000
committer Fiona Campbell <flc@google.com> Thu Aug 11 10:37:07 2022 +0000
tree 3a0c5550bcd6c6853a582c09d30e63b69be713ab
parent 83f3bbb832e7b21545d5aa95c0a817db37d8d3b9

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

services/core/java/com/android/server/display/DisplayDeviceConfig.java

diff --git a/services/core/java/com/android/server/display/DisplayDeviceConfig.java b/services/core/java/com/android/server/display/DisplayDeviceConfig.java
index b5aa7b1..3d7c7e2 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.Arrays;
 import java.util.Collection;
 import java.util.List;
+import java.util.Locale;
 
 import javax.xml.datatype.DatatypeConfigurationException;
 
@@ -669,8 +670,8 @@
     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);