diff options
| author | John Wang <johnwang@google.com> | 2010-03-04 14:42:42 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-03-04 14:42:42 -0800 |
| commit | fe4f2c9ea2c97c58ace24d6abaeae30165f16e0e (patch) | |
| tree | 81f0fe1d8124c95af5c7dd02b0e17d7683196d4d /telephony | |
| parent | 4736ff3534e55c4aabdf3a69508841c8b1f86dd7 (diff) | |
| parent | 0bd36175fbdf4f1506c5dcf93b43f3559837e207 (diff) | |
| download | frameworks_base-fe4f2c9ea2c97c58ace24d6abaeae30165f16e0e.zip frameworks_base-fe4f2c9ea2c97c58ace24d6abaeae30165f16e0e.tar.gz frameworks_base-fe4f2c9ea2c97c58ace24d6abaeae30165f16e0e.tar.bz2 | |
Merge "Add r-w property of emergency number list."
Diffstat (limited to 'telephony')
| -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, |