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 
am: 8405e5cd3b

* commit '8405e5cd3b3b2491b5f487cbe26d9e1550e55370':
  Replace usages of ShortNumberUtil with ShortNumberInfo
This commit is contained in:
Paul Duffin
2016-02-09 16:56:50 +00:00
committed by android-build-merger
parent f568f547d8 8405e5cd3b
commit f1adce018d
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.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);
}
}