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

Commit 864b2fe3 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/36066494'] into 25Q4-release. 

Change-Id: I27147443f7bfcc1ee47d8c40ec542739642dc077
parents f4623e0e 3ef06f42

src/java/com/android/internal/telephony/GsmCdmaPhone.java

+1 −3
Original line number Diff line number Diff line
@@ -2962,8 +2962,7 @@ public class GsmCdmaPhone extends Phone { 


            case EVENT_SET_VM_NUMBER_DONE:

                ar = (AsyncResult)msg.obj;

                if (mSimRecords != null && IccVmNotSupportedException.class

                        .isInstance(ar.exception)) {

                if (ar.exception instanceof IccVmNotSupportedException) {

                    storeVoiceMailNumber(mVmNumber);

                    ar.exception = null;

                }
@@ -2974,7 +2973,6 @@ public class GsmCdmaPhone extends Phone { 
                }

                break;





            case EVENT_GET_CALL_FORWARD_DONE:

                ar = (AsyncResult)msg.obj;

                if (ar.exception == null) {