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

am 2fab5307: am d060b50b: Merge "Change to treat slotId 0 emergency numbers as default." into lmp-mr1-dev

Browse Source 
automerge: 98cc133

* commit '98cc133f077ba393d6c9a6e302c3e89ade64247f':
  Change to treat slotId 0 emergency numbers as default.
This commit is contained in:
Amit Mahajan
2014-12-15 19:28:43 +00:00
committed by android-build-merger
parent 12647d923d 98cc133f07
commit 33dba3d4d3
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 = "";
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);