Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 492d79d2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 4a24c542 7c94b7a9

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

+3 −2
Original line number Diff line number Diff line
@@ -66,6 +66,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;
@@ -708,8 +709,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);