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

Commit 72e86274 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 

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

Change-Id: I514b83c1747121cd02033803cc55df454137e7c3
parents 4f1541a5 5713dce7

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.

     *