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

Commit d971ebad authored by Jinsuk Kim's avatar Jinsuk Kim Committed by Android Git Automerger
Browse files

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

* commit '256642aa':
  CEC: Do not switch language if the new one is same as the old one
parents 6eee5e4d 256642aa

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

+8 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import com.android.server.hdmi.HdmiAnnotations.ServiceThreadOnly; 


import java.io.UnsupportedEncodingException;

import java.util.List;

import java.util.Locale;



/**

 * Represent a logical device of type Playback residing in Android system.
@@ -317,6 +318,13 @@ final class HdmiCecLocalDevicePlayback extends HdmiCecLocalDevice { 


        try {

            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

            // which is not available on Settings.