diff options
| author | Amit Mahajan <amitmahajan@google.com> | 2014-12-15 19:06:46 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-15 19:06:48 +0000 |
| commit | d060b50b331f540d42c91501d820e3c2601dec18 (patch) | |
| tree | 07fa84c8b87dda7e91359cf125bf81be5ce2009d /telephony/java | |
| parent | 9973643bfc123fcc73803542ef8cb74e243907ce (diff) | |
| parent | d9835f0c16b01847b7b3f6a1d4620912fb4206c2 (diff) | |
| download | frameworks_base-d060b50b331f540d42c91501d820e3c2601dec18.zip frameworks_base-d060b50b331f540d42c91501d820e3c2601dec18.tar.gz frameworks_base-d060b50b331f540d42c91501d820e3c2601dec18.tar.bz2 | |
Merge "Change to treat slotId 0 emergency numbers as default." into lmp-mr1-dev
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); |