diff options
| author | John Wang <johnwang@google.com> | 2010-03-04 14:05:49 -0800 |
|---|---|---|
| committer | John Wang <johnwang@google.com> | 2010-03-04 14:05:49 -0800 |
| commit | 0bd36175fbdf4f1506c5dcf93b43f3559837e207 (patch) | |
| tree | ded5a07d372ba8c3bd0d5f1401df7af9a1042bbb /telephony/java | |
| parent | 687c1330641b614e44c11842b37477666ae63c23 (diff) | |
| download | frameworks_base-0bd36175fbdf4f1506c5dcf93b43f3559837e207.zip frameworks_base-0bd36175fbdf4f1506c5dcf93b43f3559837e207.tar.gz frameworks_base-0bd36175fbdf4f1506c5dcf93b43f3559837e207.tar.bz2 | |
Add r-w property of emergency number list.
Currently, the emergency calls are put into an readonly property ro.ril.ecclist.
It is possible that ecclist has to be changed before and after SIM pin lock.
And ecclist can also be changed after network broadcasts the local emgergency numbers.
So add r-w property ril.ecclist to make emergency number list changable, while still
check r-o property to make old RIL work.
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, |