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

Commit 9b46d940 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove the "set network type" when radio on" into sc-qpr1-dev

parents b0936add befefb11

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

+0 −4
Original line number Diff line number Diff line
@@ -2805,10 +2805,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
@@ -4397,13 +4397,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.

     *