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

Commit 8a270f5c authored by HYUNG HEO's avatar HYUNG HEO Committed by android-build-merger
Browse files

Merge "Improve carrierconfig to support multisim in SIMRecords" am: 9981d8ad 

am: 73f07d29

Change-Id: I00d10bdd3f29b735d556808945a796fadf46d7c5
parents 67027888 73f07d29

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;