diff options
| author | Amit Mahajan <amitmahajan@google.com> | 2014-12-15 19:28:43 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-12-15 19:28:43 +0000 |
| commit | 33dba3d4d381350a4ee1ce72162155c3d78093bc (patch) | |
| tree | 45955d438151b2d1519aecbcc87d3ac40d99fd1d /telephony | |
| parent | 12647d923d25f20a852b0cf7ed41f67a8b15da8f (diff) | |
| parent | 98cc133f077ba393d6c9a6e302c3e89ade64247f (diff) | |
| download | frameworks_base-33dba3d4d381350a4ee1ce72162155c3d78093bc.zip frameworks_base-33dba3d4d381350a4ee1ce72162155c3d78093bc.tar.gz frameworks_base-33dba3d4d381350a4ee1ce72162155c3d78093bc.tar.bz2 | |
am 2fab5307: am d060b50b: Merge "Change to treat slotId 0 emergency numbers as default." into lmp-mr1-dev
automerge: 98cc133
* commit '98cc133f077ba393d6c9a6e302c3e89ade64247f':
Change to treat slotId 0 emergency numbers as default.
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/java/android/telephony/PhoneNumberUtils.java | 10 |
1 files changed, 4 insertions, 6 deletions
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 @@ 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); |