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

Commit befefb11 authored by SongFerngWang's avatar SongFerngWang
Browse files

Remove the "set network type" when radio on 

It affects the modem do attch network, so Framework remove it.
Framework do "set network type" when carrier config loaded.

Bug: 193000272
Test: 1. build pass
2. manualy test:
2.1 set airplane mode on and then reboot device. (checking set network
type after boot up) (Pass)
2.2 set airplane mode off and then check the network state (PASS)

Change-Id: I932cf8a7e7df7aeee4fb195b72c5bfabdc790d44
parent aadf244e

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.

     *