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

Commit 5835def3 authored by Arun kumar Voddu's avatar Arun kumar Voddu Committed by Automerger Merge Worker
Browse files

Merge "Skip setters operation if SIMRecords is disposed." am: e949773b am:... 

Merge "Skip setters operation if SIMRecords is disposed." am: e949773b am: 89b975f6 am: 8640df1d

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1850357

Change-Id: Id3b857d308ac06a44da2b1d16cabe2f10a116c40
parents ea0699c6 8640df1d

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

+12 −2
Original line number Diff line number Diff line
@@ -308,7 +308,9 @@ public class SIMRecords extends IccRecords { 
    @Override

    public void setMsisdnNumber(String alphaTag, String number,

            Message onComplete) {



        if (mDestroyed.get()) {

            return;

        }

        // If the SIM card is locked by PIN, we will set EF_MSISDN fail.

        // In that case, msisdn and msisdnTag should not be update.

        mNewMsisdn = number;
@@ -412,6 +414,9 @@ public class SIMRecords extends IccRecords { 
    @Override

    public void

    setVoiceMessageWaiting(int line, int countWaiting) {

        if (mDestroyed.get()) {

            return;

        }

        if (line != 1) {

            // only profile 1 is supported

            return;
@@ -515,7 +520,9 @@ public class SIMRecords extends IccRecords { 
    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    @Override

    public void setVoiceCallForwardingFlag(int line, boolean enable, String dialNumber) {



        if (mDestroyed.get()) {

            return;

        }

        if (line != 1) return; // only line 1 is supported



        mCallForwardingStatus = enable ? CALL_FORWARDING_STATUS_ENABLED :
@@ -1514,6 +1521,9 @@ public class SIMRecords extends IccRecords { 
    //***** Private methods



    private void setVoiceMailByCountry (String spn) {

        if (mDestroyed.get()) {

            return;

        }

        if (mVmConfig.containsCarrier(spn)) {

            mIsVoiceMailFixed = true;

            mVoiceMailNum = mVmConfig.getVoiceMailNumber(spn);