Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9981d8ad authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Improve carrierconfig to support multisim in SIMRecords"

parents 3029837a bc7f2413

src/java/com/android/internal/telephony/uicc/SIMRecords.java

+13 −9
Original line number Diff line number Diff line
@@ -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(

                            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;