From d9835f0c16b01847b7b3f6a1d4620912fb4206c2 Mon Sep 17 00:00:00 2001 From: Amit Mahajan Date: Fri, 12 Dec 2014 14:30:30 -0800 Subject: [PATCH] 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 | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/telephony/java/android/telephony/PhoneNumberUtils.java b/telephony/java/android/telephony/PhoneNumberUtils.java index 0844232653aaa..4ff63894c6c39 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);