diff options
Diffstat (limited to 'telephony/java')
-rw-r--r-- | telephony/java/android/telephony/PhoneNumberUtils.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/telephony/java/android/telephony/PhoneNumberUtils.java b/telephony/java/android/telephony/PhoneNumberUtils.java index 6797f78..32e7176 100644 --- a/telephony/java/android/telephony/PhoneNumberUtils.java +++ b/telephony/java/android/telephony/PhoneNumberUtils.java @@ -1311,7 +1311,12 @@ public class PhoneNumberUtils number = extractNetworkPortionAlt(number); // retrieve the list of emergency numbers - String numbers = SystemProperties.get("ro.ril.ecclist"); + // check read-write ecclist property first + String numbers = SystemProperties.get("ril.ecclist"); + if (TextUtils.isEmpty(numbers)) { + // then read-only ecclist property since old RIL only uses this + numbers = SystemProperties.get("ro.ril.ecclist"); + } if (!TextUtils.isEmpty(numbers)) { // searches through the comma-separated list for a match, |