diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-03-10 21:08:35 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-03-10 21:08:35 +0000 |
| commit | 6605646e288552a4d1ff80ecc672bd40169c2669 (patch) | |
| tree | 95686824df9a7c3a6643250a0cae08c53c9bf26d /src/java/com/android/internal/telephony/GsmCdmaPhone.java | |
| parent | 1be3fdb76daba1226748881f2a5ced94934b29b1 (diff) | |
| parent | 1b75d80ffff871e31a69d77a865c8309ed64c6ff (diff) | |
| download | android_frameworks_opt_telephony-6605646e288552a4d1ff80ecc672bd40169c2669.tar.gz android_frameworks_opt_telephony-6605646e288552a4d1ff80ecc672bd40169c2669.tar.bz2 android_frameworks_opt_telephony-6605646e288552a4d1ff80ecc672bd40169c2669.zip | |
Snap for 5363709 from 1b75d80ffff871e31a69d77a865c8309ed64c6ff to pi-qpr3-b-release
Change-Id: I4fd73cc8d7507231b0b393703c755759695ae8d0
Diffstat (limited to 'src/java/com/android/internal/telephony/GsmCdmaPhone.java')
| -rw-r--r-- | src/java/com/android/internal/telephony/GsmCdmaPhone.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/java/com/android/internal/telephony/GsmCdmaPhone.java b/src/java/com/android/internal/telephony/GsmCdmaPhone.java index cd6dc322f..13f8b0bad 100644 --- a/src/java/com/android/internal/telephony/GsmCdmaPhone.java +++ b/src/java/com/android/internal/telephony/GsmCdmaPhone.java @@ -1610,6 +1610,13 @@ public class GsmCdmaPhone extends Phone { IccRecords r = mIccRecords.get(); return (r != null) ? r.getMsisdnNumber() : null; } else { + CarrierConfigManager configManager = (CarrierConfigManager) + mContext.getSystemService(Context.CARRIER_CONFIG_SERVICE); + boolean use_usim = configManager.getConfigForSubId(getSubId()).getBoolean( + CarrierConfigManager.KEY_USE_USIM_BOOL); + if (use_usim) { + return (mSimRecords != null) ? mSimRecords.getMsisdnNumber() : null; + } return mSST.getMdnNumber(); } } |