Merge "Add r-w property of emergency number list."

2010-03-04 14:42:42 -08:00
parent 4736ff3534 0bd36175fb
commit fe4f2c9ea2
1 changed files with 6 additions and 1 deletions
--- 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,