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

Commit 07f03d78 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 

am: 38e54d7e

Change-Id: Icf996074260b90ecf0dcd0f70d2ecb7ba9d79100
parents 45e836ec 38e54d7e

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

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

                } else {

                    if (ar.userObj != null) {

                        Resources resource = Resources.getSystem();

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

                                    R.bool.editable_voicemailnumber)) {

                        CarrierConfigManager configLoader = (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