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

Commit 7e0352da authored by Narayan Kamath's avatar Narayan Kamath Committed by Gerrit Code Review
Browse files

Merge "Track changes to locale management."

parents 2865ee97 595c172c

src/java/com/android/internal/telephony/MccTable.java

+3 −3
Original line number Diff line number Diff line
@@ -263,9 +263,9 @@ public final class MccTable 
        if (Build.IS_DEBUGGABLE) {

            alwaysPersist = SystemProperties.getBoolean("persist.always.persist.locale", false);

        }

        String persistSysLanguage = SystemProperties.get("persist.sys.language", "");

        String persistSysCountry = SystemProperties.get("persist.sys.country", "");

        if (!(alwaysPersist || (persistSysLanguage.isEmpty() && persistSysCountry.isEmpty()))) {



        final String persistedLocale = SystemProperties.get("persist.sys.locale", "");

        if (!alwaysPersist && !persistedLocale.isEmpty()) {

            Slog.d(LOG_TAG, "getLocaleForLanguageCountry: skipping already persisted");

            return null;

        }

src/java/com/android/internal/telephony/cat/CatService.java

+1 −2
Original line number Diff line number Diff line
@@ -576,9 +576,8 @@ public class CatService extends Handler implements AppInterface { 
    }



    private void getPliResponse(ByteArrayOutputStream buf) {



        // Locale Language Setting

        String lang = SystemProperties.get("persist.sys.language");

        final String lang = Locale.getDefault().getLanguage();



        if (lang != null) {

            // tag