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

Commit 61617922 authored by SongFerng Wang's avatar SongFerng Wang Committed by Automerger Merge Worker
Browse files

Merge "Remove the "set network type" when radio on" am: 5713dce7 am: 72e86274 

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

Change-Id: Ib474b80b4bc2b944e8a077b835c6e16945551652
parents 0fbb038f 72e86274

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

+0 −4
Original line number Diff line number Diff line
@@ -2814,10 +2814,6 @@ public class GsmCdmaPhone extends Phone { 
        if (!isPhoneTypeGsm()) {

            mCdmaSubscriptionSource = mCdmaSSM.getCdmaSubscriptionSource();

        }



        // If this is on APM off, SIM may already be loaded. Send setPreferredNetworkType

        // request to RIL to preserve user setting across APM toggling

        setPreferredNetworkTypeIfSimLoaded();

    }



    private void handleRadioOffOrNotAvailable() {

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

+0 −7
Original line number Diff line number Diff line
@@ -4395,13 +4395,6 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
        }

    }



    protected void setPreferredNetworkTypeIfSimLoaded() {

        int subId = getSubId();

        if (SubscriptionManager.isValidSubscriptionId(subId)) {

            updateAllowedNetworkTypes(null);

        }

    }



    /**

     * Registers the handler when phone radio  capability is changed.

     *