diff options
| author | HYUNG HEO <sunemo83@gmail.com> | 2018-10-19 00:04:50 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-10-19 00:04:50 -0700 |
| commit | 73f07d29ba54a82b8b6ad286d86f1a3bdec5cc5c (patch) | |
| tree | 692d228196d43b49a9f310934319ef7565084fd1 | |
| parent | 94409e4ddc7ef8f6ffda9beecae95173747e1fe0 (diff) | |
| parent | 9981d8ad86bd49b1d40f4a33708d5b352a695621 (diff) | |
| download | telephony-pie-temp.tar.gz | |
Merge "Improve carrierconfig to support multisim in SIMRecords"pie-temp
am: 9981d8ad86
Change-Id: I75c0ecc317dfb416a03982e56e4dbe0f2b0ec0fc
| -rwxr-xr-x | src/java/com/android/internal/telephony/uicc/SIMRecords.java | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/java/com/android/internal/telephony/uicc/SIMRecords.java b/src/java/com/android/internal/telephony/uicc/SIMRecords.java index 4f44f15097..d1574c778a 100755 --- a/src/java/com/android/internal/telephony/uicc/SIMRecords.java +++ b/src/java/com/android/internal/telephony/uicc/SIMRecords.java @@ -1028,16 +1028,20 @@ public class SIMRecords extends IccRecords { onCphsCompleted)); } else { if (ar.userObj != null) { - CarrierConfigManager configLoader = (CarrierConfigManager) + CarrierConfigManager configManager = (CarrierConfigManager) mContext.getSystemService(Context.CARRIER_CONFIG_SERVICE); - if (ar.exception != null && configLoader != null - && configLoader.getConfig().getBoolean( - CarrierConfigManager.KEY_EDITABLE_VOICEMAIL_NUMBER_BOOL)) { - // GsmCdmaPhone will store vm number on device - // when IccVmNotSupportedException occurred - AsyncResult.forMessage(((Message) ar.userObj)).exception = - new IccVmNotSupportedException( - "Update SIM voice mailbox error"); + if (ar.exception != null && configManager != null) { + PersistableBundle b = configManager.getConfigForSubId( + SubscriptionController.getInstance().getSubIdUsingPhoneId( + mParentApp.getPhoneId())); + if (b != null && b.getBoolean( + CarrierConfigManager.KEY_EDITABLE_VOICEMAIL_NUMBER_BOOL)) { + // GsmCdmaPhone will store vm number on device + // when IccVmNotSupportedException occurred + AsyncResult.forMessage(((Message) ar.userObj)).exception = + new IccVmNotSupportedException( + "Update SIM voice mailbox error"); + } } else { AsyncResult.forMessage(((Message) ar.userObj)) .exception = ar.exception; |