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

Commit 8e099647 authored by Jae Seo's avatar Jae Seo Committed by Android Git Automerger
Browse files

am 7a93b5de: am 25cb2b99: am d19ed4c1: Merge "TIF: Avoid generating locale... 

am 7a93b5de: am 25cb2b99: am d19ed4c1: Merge "TIF: Avoid generating locale dependent input IDs" into mnc-dev

* commit '7a93b5de':
  TIF: Avoid generating locale dependent input IDs
parents 19d6dae4 7a93b5de

media/java/android/media/tv/TvInputInfo.java

+2 −1
Original line number Diff line number Diff line
@@ -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());

    }