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

Commit 9e296a06 authored by sqian's avatar sqian
Browse files

Replace LocaleTracker with CountryDetector 

Because CountryDetector considers more sources than what LocaleTracker
considers to report country ISO and thus it might be more comprehensive,
use CountryDetector instead of LocaleTracker to update Country ISO for
EmergencyNumberTracker.

Test: Manual
Bug: 120849585
Change-Id: I731c39adc0493979fe4c12e99fd65507c8da4177
Merged-In: I731c39adc0493979fe4c12e99fd65507c8da4177
(cherry picked from commit fa0d8719)
parent ce24b25c

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

+0 −10
Original line number Diff line number Diff line
@@ -417,16 +417,6 @@ public class LocaleTracker extends Handler { 
            mLocalLog.log(msg);

            mCurrentCountryIso = countryIso;



            // Inform EmergencyNumberTrack with the change of current Country ISO

            if (mPhone != null && mPhone.getEmergencyNumberTracker() != null) {

                mPhone.getEmergencyNumberTracker().updateEmergencyNumberDatabaseCountryChange(

                        getCurrentCountry());

                log("Notified EmergencyNumberTracker");

            } else {

                loge("Cannot notify EmergencyNumberTracker. Phone is null? "

                        + Boolean.toString(mPhone == null));

            }



            TelephonyManager.setTelephonyProperty(mPhone.getPhoneId(),

                    TelephonyProperties.PROPERTY_OPERATOR_ISO_COUNTRY, mCurrentCountryIso);

src/java/com/android/internal/telephony/emergency/EmergencyNumberTracker.java

+31 −3
Original line number Diff line number Diff line
@@ -16,6 +16,10 @@ 


package com.android.internal.telephony.emergency;



import android.content.Context;

import android.location.Country;

import android.location.CountryDetector;

import android.location.CountryListener;

import android.os.AsyncResult;

import android.os.Handler;

import android.os.Message;
@@ -70,6 +74,7 @@ public class EmergencyNumberTracker extends Handler { 


    private final CommandsInterface mCi;

    private final Phone mPhone;

    private CountryDetector mCountryDetector;

    private String mCountryIso;



    private static final String EMERGENCY_NUMBER_DB_ASSETS_FILE = "eccdata";
@@ -97,6 +102,17 @@ public class EmergencyNumberTracker extends Handler { 
    public EmergencyNumberTracker(Phone phone, CommandsInterface ci) {

        mPhone = phone;

        mCi = ci;

        if (mPhone != null) {

            mCountryDetector = (CountryDetector) mPhone.getContext().getSystemService(

                    Context.COUNTRY_DETECTOR);

            if (mCountryDetector != null) {

                mCountryDetector.addCountryListener(new CountryListener() {

                    public void onCountryDetected(Country country) {

                        updateEmergencyNumberDatabaseCountryChange(country.getCountryIso());

                    }

                }, getLooper());

            }

        }

        initializeDatabaseEmergencyNumberList();

        mCi.registerForEmergencyNumberList(this, EVENT_UNSOL_EMERGENCY_NUMBER_LIST, null);

    }
@@ -143,11 +159,23 @@ public class EmergencyNumberTracker extends Handler { 
    }



    private void initializeDatabaseEmergencyNumberList() {

        // If country iso has been cached when listener is set, don't need to cache the initial

        // country iso and initial database.

        if (mCountryIso == null) {

            mCountryIso = getInitialCountryIso().toLowerCase();

            cacheEmergencyDatabaseByCountry(mCountryIso);

        }

    }



    private String getInitialCountryIso() {

        Country country = null;

        if (mCountryDetector != null) {

            country = mCountryDetector.detectCountry();

            if (country != null) {

                return country.getCountryIso();

            }

        }

        // Fallback to Telephony's country detector if there are issues with CountryDetector

        if (mPhone != null) {

            ServiceStateTracker sst = mPhone.getServiceStateTracker();

            if (sst != null) {
@@ -216,7 +244,7 @@ public class EmergencyNumberTracker extends Handler { 
                    mPhone.getContext().getAssets().open(EMERGENCY_NUMBER_DB_ASSETS_FILE));

            allEccMessages = ProtobufEccData.AllInfo.parseFrom(readInputStreamToByteArray(

                    new GZIPInputStream(inputStream)));

            logd("Emergency database is loaded. ");

            logd(countryIso + " emergency database is loaded. ");

            for (ProtobufEccData.CountryInfo countryEccInfo : allEccMessages.countries) {

                if (countryEccInfo.isoCode.equals(countryIso.toUpperCase())) {

                    for (ProtobufEccData.EccInfo eccInfo : countryEccInfo.eccs) {

tests/telephonytests/src/com/android/internal/telephony/emergency/EmergencyNumberTrackerTest.java

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.internal.telephony.emergency;



import static org.junit.Assert.assertEquals;

import static org.mockito.Mockito.doReturn;



import android.os.AsyncResult;

import android.os.HandlerThread;
@@ -58,6 +59,7 @@ public class EmergencyNumberTrackerTest extends TelephonyTest { 
    public void setUp() throws Exception {

        logd("EmergencyNumberTrackerTest +Setup!");

        super.setUp("EmergencyNumberTrackerTest");

        doReturn(mContext).when(mPhone).getContext();

        initializeEmergencyNumberListTestSamples();

        mHandlerThread = new EmergencyNumberTrackerTestHandler("EmergencyNumberTrackerTestHandler");

        mHandlerThread.start();