Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Change to treat slotId 0 emergency numbers as default." into lmp-mr1-dev

Browse Source
This commit is contained in:
Amit Mahajan
2014-12-15 19:06:46 +00:00
committed by Android (Google) Code Review
parent 9973643bfc d9835f0c16
commit d060b50b33
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
telephony/java/android/telephony/PhoneNumberUtils.java
View File

@@ -1823,13 +1823,11 @@ public class PhoneNumberUtils
String emergencyNumbers = ""; String emergencyNumbers = "";
int slotId = SubscriptionManager.getSlotId(subId); int slotId = SubscriptionManager.getSlotId(subId);
if (slotId >= 0) { // retrieve the list of emergency numbers
// retrieve the list of emergency numbers // check read-write ecclist property first
// check read-write ecclist property first String ecclist = (slotId <= 0) ? "ril.ecclist" : ("ril.ecclist" + slotId);
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); Rlog.d(LOG_TAG, "slotId:" + slotId + ", emergencyNumbers: " + emergencyNumbers);