diff options
| author | Jinsuk Kim <jinsukkim@google.com> | 2015-06-09 04:49:06 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-09 04:49:08 +0000 |
| commit | 5795a25cad59f199c5da1bee3cb21043bb1b19eb (patch) | |
| tree | 870790de2b0ee24bf08937edcc82de39d29214eb /media | |
| parent | e3d670dc1edc893e1baa98510f67bf929578d591 (diff) | |
| parent | 4b20865817c1c501bbf8cb381b70f8ae9bf0ae49 (diff) | |
| download | frameworks_base-5795a25cad59f199c5da1bee3cb21043bb1b19eb.zip frameworks_base-5795a25cad59f199c5da1bee3cb21043bb1b19eb.tar.gz frameworks_base-5795a25cad59f199c5da1bee3cb21043bb1b19eb.tar.bz2 | |
Merge "TIF: Generate hardware input id in language-neutral fashion" into mnc-dev
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/media/tv/TvInputInfo.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/media/java/android/media/tv/TvInputInfo.java b/media/java/android/media/tv/TvInputInfo.java index 4b1fa13..c537dd6 100644 --- a/media/java/android/media/tv/TvInputInfo.java +++ b/media/java/android/media/tv/TvInputInfo.java @@ -549,8 +549,9 @@ public final class TvInputInfo implements Parcelable { private static final String generateInputIdForHdmiDevice( ComponentName name, HdmiDeviceInfo deviceInfo) { // Example of the format : "/HDMI%04X%02X" - String format = String.format("%s%s%%0%sX%%0%sX", DELIMITER_INFO_IN_ID, PREFIX_HDMI_DEVICE, - LENGTH_HDMI_PHYSICAL_ADDRESS, LENGTH_HDMI_DEVICE_ID); + 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, deviceInfo.getPhysicalAddress(), deviceInfo.getId()); } @@ -564,8 +565,8 @@ public final class TvInputInfo implements Parcelable { */ private static final String generateInputIdForHardware( ComponentName name, TvInputHardwareInfo hardwareInfo) { - return name.flattenToShortString() + String.format("%s%s%d", - DELIMITER_INFO_IN_ID, PREFIX_HARDWARE_DEVICE, hardwareInfo.getDeviceId()); + return name.flattenToShortString() + DELIMITER_INFO_IN_ID + PREFIX_HARDWARE_DEVICE + + hardwareInfo.getDeviceId(); } public static final Parcelable.Creator<TvInputInfo> CREATOR = |