diff options
| author | Amit Mahajan <amitmahajan@google.com> | 2014-12-12 14:30:30 -0800 |
|---|---|---|
| committer | Amit Mahajan <amitmahajan@google.com> | 2014-12-15 10:38:27 -0800 |
| commit | d9835f0c16b01847b7b3f6a1d4620912fb4206c2 (patch) | |
| tree | e9d3cc6e09cd5cc9e7699d5b51720e3e8e574643 /telephony/java | |
| parent | 951dcdd9404054f6b7e794b18aad6f50e44732f9 (diff) | |
| download | frameworks_base-d9835f0c16b01847b7b3f6a1d4620912fb4206c2.zip frameworks_base-d9835f0c16b01847b7b3f6a1d4620912fb4206c2.tar.gz frameworks_base-d9835f0c16b01847b7b3f6a1d4620912fb4206c2.tar.bz2 | |
Change to treat slotId 0 emergency numbers as default.
Emergency numbers are slot specific. This change is to read emergency
numbers for slotId 0 if slotId is unknown/invalid.
Bug: 18656027
Change-Id: Ibaeb720955f6abc421b84d3cb32eb812b6c55a34
Diffstat (limited to 'telephony/java')
| -rw-r--r-- | telephony/java/android/telephony/PhoneNumberUtils.java | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/telephony/java/android/telephony/PhoneNumberUtils.java b/telephony/java/android/telephony/PhoneNumberUtils.java index 0844232..4ff6389 100644 --- a/telephony/java/android/telephony/PhoneNumberUtils.java +++ b/telephony/java/android/telephony/PhoneNumberUtils.java @@ -1823,13 +1823,11 @@ public class PhoneNumberUtils String emergencyNumbers = ""; int slotId = SubscriptionManager.getSlotId(subId); - if (slotId >= 0) { - // retrieve the list of emergency numbers - // check read-write ecclist property first - String ecclist = (slotId == 0) ? "ril.ecclist" : ("ril.ecclist" + slotId); + // retrieve the list of emergency numbers + // check read-write ecclist property first + String ecclist = (slotId <= 0) ? "ril.ecclist" : ("ril.ecclist" + slotId); - emergencyNumbers = SystemProperties.get(ecclist, ""); - } + emergencyNumbers = SystemProperties.get(ecclist, ""); Rlog.d(LOG_TAG, "slotId:" + slotId + ", emergencyNumbers: " + emergencyNumbers); |