Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "CEC: Do not switch language if the new one is same as the old one" into mnc-dev

Browse Source
This commit is contained in:
Jinsuk Kim
2015-07-10 21:09:07 +00:00
committed by Android (Google) Code Review
parent c1541571ff 8ea452e3f6
commit 256642aa2f
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
View File

@@ -33,6 +33,7 @@ import com.android.server.hdmi.HdmiAnnotations.ServiceThreadOnly;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.util.List; import java.util.List;
import java.util.Locale;
/** /**
* Represent a logical device of type Playback residing in Android system. * Represent a logical device of type Playback residing in Android system.
@@ -317,6 +318,13 @@ final class HdmiCecLocalDevicePlayback extends HdmiCecLocalDevice {
try { try {
String iso3Language = new String(message.getParams(), 0, 3, "US-ASCII"); String iso3Language = new String(message.getParams(), 0, 3, "US-ASCII");
Locale currentLocale = mService.getContext().getResources().getConfiguration().locale;
if (currentLocale.getISO3Language().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.
return true;
}
// Don't use Locale.getAvailableLocales() since it returns a locale // Don't use Locale.getAvailableLocales() since it returns a locale
// which is not available on Settings. // which is not available on Settings.