commit d9835f0c16b01847b7b3f6a1d4620912fb4206c2
author Amit Mahajan <amitmahajan@google.com> Fri Dec 12 14:30:30 2014 -0800
committer Amit Mahajan <amitmahajan@google.com> Mon Dec 15 10:38:27 2014 -0800
tree e9d3cc6e09cd5cc9e7699d5b51720e3e8e574643
parent 951dcdd9404054f6b7e794b18aad6f50e44732f9

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

telephony/java/android/telephony/PhoneNumberUtils.java

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);