Merge "cec: fix Traditional Chinese issue for Playback [1/1] BUG:183071276" (f4c40e0b) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -275,7 +275,9 @@ public class HdmiCecLocalDevicePlayback extends HdmiCecLocalDeviceSource {
		try {
		String iso3Language = new String(message.getParams(), 0, 3, "US-ASCII");
		Locale currentLocale = mService.getContext().getResources().getConfiguration().locale;
		if (currentLocale.getISO3Language().equals(iso3Language)) {
		String curIso3Language = mService.localeToMenuLanguage(currentLocale);
		HdmiLogger.debug("handleSetMenuLanguage " + iso3Language + " cur:" + curIso3Language);
		if (curIso3Language.equals(iso3Language)) {
		// Do not switch language if the new language is the same as the current one.
		// This helps avoid accidental country variant switching from en_US to en_AU
		// due to the limitation of CEC. See the warning below.
		@@ -287,7 +289,7 @@ public class HdmiCecLocalDevicePlayback extends HdmiCecLocalDeviceSource {
		final List<LocaleInfo> localeInfos = LocalePicker.getAllAssetLocales(
		mService.getContext(), false);
		for (LocaleInfo localeInfo : localeInfos) {
		if (localeInfo.getLocale().getISO3Language().equals(iso3Language)) {
		if (mService.localeToMenuLanguage(localeInfo.getLocale()).equals(iso3Language)) {
		// WARNING: CEC adopts ISO/FDIS-2 for language code, while Android requires
		// additional country variant to pinpoint the locale. This keeps the right
		// locale from being chosen. 'eng' in the CEC command, for instance,