am 8be95fdd: Merge "CEC: Use language code "chi" for Traditional Chinese" into lmp-mr1-dev (2dfb7397) · Commits · e / os / android_frameworks_base

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

+15 −1

Original line number	Original line	Diff line number	Diff line
	@@ -90,6 +90,8 @@ import java.util.Locale;
	*/		*/
	public final class HdmiControlService extends SystemService {		public final class HdmiControlService extends SystemService {
	private static final String TAG = "HdmiControlService";		private static final String TAG = "HdmiControlService";
			private final Locale HONG_KONG = new Locale("zh", "HK");
			private final Locale MACAU = new Locale("zh", "MO");

	static final String PERMISSION = "android.permission.HDMI_CEC";		static final String PERMISSION = "android.permission.HDMI_CEC";

	@@ -146,13 +148,25 @@ public final class HdmiControlService extends SystemService {
	}		}
	break;		break;
	case Intent.ACTION_CONFIGURATION_CHANGED:		case Intent.ACTION_CONFIGURATION_CHANGED:
	String language = Locale.getDefault().getISO3Language();		String language = getMenuLanguage();
	if (!mLanguage.equals(language)) {		if (!mLanguage.equals(language)) {
	onLanguageChanged(language);		onLanguageChanged(language);
	}		}
	break;		break;
	}		}
	}		}

			private String getMenuLanguage() {
			Locale locale = Locale.getDefault();
			if (locale.equals(Locale.TAIWAN) \|\| locale.equals(HONG_KONG) \|\| locale.equals(MACAU)) {
			// Android always returns "zho" for all Chinese variants.
			// Use "bibliographic" code defined in CEC639-2 for traditional
			// Chinese used in Taiwan/Hong Kong/Macau.
			return "chi";
			} else {
			return locale.getISO3Language();
			}
			}
	}		}

	// A thread to handle synchronous IO of CEC and MHL control service.		// A thread to handle synchronous IO of CEC and MHL control service.