am 2fab5307: am d060b50b: Merge "Change to treat slotId 0 emergency numbers as default." into lmp-mr1-dev
* commit '2fab5307d1983b0415b7eeb79779ecaee7b67ea1':
Change to treat slotId 0 emergency numbers as default.
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 @@
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);