Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Replace usages of ShortNumberUtil with ShortNumberInfo"

Browse Source
This commit is contained in:
Paul Duffin
2016-02-09 16:51:09 +00:00
committed by Gerrit Code Review
parent 857b65657d c2884fe259
commit 8405e5cd3b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
telephony/java/android/telephony/PhoneNumberUtils.java
View File

@@ -20,7 +20,7 @@ import com.android.i18n.phonenumbers.NumberParseException;
import com.android.i18n.phonenumbers.PhoneNumberUtil; import com.android.i18n.phonenumbers.PhoneNumberUtil;
import com.android.i18n.phonenumbers.PhoneNumberUtil.PhoneNumberFormat; import com.android.i18n.phonenumbers.PhoneNumberUtil.PhoneNumberFormat;
import com.android.i18n.phonenumbers.Phonenumber.PhoneNumber; 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.Context;
import android.content.Intent; import android.content.Intent;
@@ -1918,11 +1918,11 @@ public class PhoneNumberUtils
// No ecclist system property, so use our own list. // No ecclist system property, so use our own list.
if (defaultCountryIso != null) { if (defaultCountryIso != null) {
ShortNumberUtil util = new ShortNumberUtil(); ShortNumberInfo info = ShortNumberInfo.getInstance();
if (useExactMatch) { if (useExactMatch) {
return util.isEmergencyNumber(number, defaultCountryIso); return info.isEmergencyNumber(number, defaultCountryIso);
} else { } else {
return util.connectsToEmergencyNumber(number, defaultCountryIso); return info.connectsToEmergencyNumber(number, defaultCountryIso);
} }
} }