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

Commit f1adce01 authored by Paul Duffin's avatar Paul Duffin Committed by android-build-merger
Browse files

Merge "Replace usages of ShortNumberUtil with ShortNumberInfo" 

am: 8405e5cd

* commit '8405e5cd':
  Replace usages of ShortNumberUtil with ShortNumberInfo
parents f568f547 8405e5cd

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;
@@ -1916,11 +1916,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);

            }

        }