Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Ensure displayId isn't translated" into tm-qpr-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-08-11 15:10:26 +00:00
committed by Android (Google) Code Review
parent 4a24c54245 7c94b7a9ef
commit 492d79d275
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/display/DisplayDeviceConfig.java
View File

@@ -66,6 +66,7 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.Locale;
import javax.xml.datatype.DatatypeConfigurationException; import javax.xml.datatype.DatatypeConfigurationException;
@@ -708,8 +709,8 @@ public class DisplayDeviceConfig {
private static DisplayDeviceConfig getConfigFromSuffix(Context context, File baseDirectory, private static DisplayDeviceConfig getConfigFromSuffix(Context context, File baseDirectory,
String suffixFormat, long idNumber) { String suffixFormat, long idNumber) {
final String suffix = String.format(suffixFormat, idNumber); final String suffix = String.format(Locale.ROOT, suffixFormat, idNumber);
final String filename = String.format(CONFIG_FILE_FORMAT, suffix); final String filename = String.format(Locale.ROOT, CONFIG_FILE_FORMAT, suffix);
final File filePath = Environment.buildPath( final File filePath = Environment.buildPath(
baseDirectory, ETC_DIR, DISPLAY_CONFIG_DIR, filename); baseDirectory, ETC_DIR, DISPLAY_CONFIG_DIR, filename);
final DisplayDeviceConfig config = new DisplayDeviceConfig(context); final DisplayDeviceConfig config = new DisplayDeviceConfig(context);