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

Commit 501a0845 authored by Narayan Kamath's avatar Narayan Kamath
Browse files

resolved conflicts for merge of 7e0352da to lmp-mr1-dev-plus-aosp 

Change-Id: I2e490d2f3aef8b7f42ea86105c0df98f6f9f9267
parents a756acb9 7e0352da

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

+2 −3
Original line number Diff line number Diff line
@@ -253,9 +253,8 @@ public final class MccTable { 


        // If this is a regular user and they already have a persisted locale, we're done.

        if (!debuggingMccOverride) {

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

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

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

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

            if (!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
@@ -626,9 +626,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