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

Commit 647ef6c0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove the "set network type" when radio on" into sc-qpr1-dev am: 9b46d940 am: f4d4d8dd 

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

Change-Id: I828827508695d19194a81a1c82a46941e630f046
parents 48517b37 f4d4d8dd

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.

     *