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

Commit 8405e5cd authored by Paul Duffin's avatar Paul Duffin Committed by Gerrit Code Review
Browse files

Merge "Replace usages of ShortNumberUtil with ShortNumberInfo"

parents 857b6565 c2884fe2

telephony/java/android/telephony/PhoneNumberUtils.java

+4 −4
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import com.android.i18n.phonenumbers.NumberParseException; 
import com.android.i18n.phonenumbers.PhoneNumberUtil;

import com.android.i18n.phonenumbers.PhoneNumberUtil.PhoneNumberFormat;

import com.android.i18n.phonenumbers.Phonenumber.PhoneNumber;

import com.android.i18n.phonenumbers.ShortNumberUtil;

import com.android.i18n.phonenumbers.ShortNumberInfo;



import android.content.Context;

import android.content.Intent;
@@ -1918,11 +1918,11 @@ public class PhoneNumberUtils 


        // No ecclist system property, so use our own list.

        if (defaultCountryIso != null) {

            ShortNumberUtil util = new ShortNumberUtil();

            ShortNumberInfo info = ShortNumberInfo.getInstance();

            if (useExactMatch) {

                return util.isEmergencyNumber(number, defaultCountryIso);

                return info.isEmergencyNumber(number, defaultCountryIso);

            } else {

                return util.connectsToEmergencyNumber(number, defaultCountryIso);

                return info.connectsToEmergencyNumber(number, defaultCountryIso);

            }

        }