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

Commit 38e54d7e authored by Jordan Liu's avatar Jordan Liu Committed by android-build-merger
Browse files

Merge "Update reference to editable_voicemailnumber" am: 6141ea95 

am: cc343aff

Change-Id: Ic4beb1d0c8beecb1e1110c9aa7c786849d8504b9
parents 48d10abf cc343aff

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

+5 −3
Original line number Original line Diff line number Diff line
@@ -1138,9 +1138,11 @@ public class SIMRecords extends IccRecords { 
                                    onCphsCompleted));

                                    onCphsCompleted));

                } else {

                } else {

                    if (ar.userObj != null) {

                    if (ar.userObj != null) {

                        Resources resource = Resources.getSystem();

                        CarrierConfigManager configLoader = (CarrierConfigManager)

                        if (ar.exception != null && resource.getBoolean(com.android.internal.

                                mContext.getSystemService(Context.CARRIER_CONFIG_SERVICE);

                                    R.bool.editable_voicemailnumber)) {

                        if (ar.exception != null && configLoader != null &&

                                configLoader.getConfig().getBoolean(

                                CarrierConfigManager.KEY_EDITABLE_VOICEMAIL_NUMBER_BOOL)) {

                            // GsmCdmaPhone will store vm number on device

                            // GsmCdmaPhone will store vm number on device

                            // when IccVmNotSupportedException occurred

                            // when IccVmNotSupportedException occurred

                            AsyncResult.forMessage(((Message) ar.userObj)).exception

                            AsyncResult.forMessage(((Message) ar.userObj)).exception