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

Commit f172f93e authored by sangyun's avatar sangyun
Browse files

Add pollState when setting automatic network selection mode is done. 

Fixed to update isManualNetworkSelection in ServiceState when the
network selection mode changes btw manual and automatic.
If there is no change in the network on which the device is camping,
there is no opportunity to update isManualNetworkSelection in
ServiceState, so trigger pollState to update ServiceState once when
the network selection mode is changed.

Bug: 326041360
Test: atest FrameworkTelephonyTests
Change-Id: Iea2e7d246ceb90026289db9539dbce53d1edf964
parent b8a76d63

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

+5 −0
Original line number Diff line number Diff line
@@ -2270,6 +2270,11 @@ public class GsmCdmaPhone extends Phone { 
        return (mManualNetworkSelectionPlmn == null) ? "" : mManualNetworkSelectionPlmn;

    }



    @Override

    protected void onSetNetworkSelectionModeCompleted() {

        mSST.pollState();

    }



    @Override

    public String getCdmaPrlVersion() {

        return mSST.getPrlVersion();

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

+7 −0
Original line number Diff line number Diff line
@@ -779,6 +779,7 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
            case EVENT_SET_NETWORK_MANUAL_COMPLETE:

            case EVENT_SET_NETWORK_AUTOMATIC_COMPLETE:

                handleSetSelectNetwork((AsyncResult) msg.obj);

                onSetNetworkSelectionModeCompleted();

                return;

        }
@@ -1535,6 +1536,12 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
        updateSavedNetworkOperator(nsm);

    }



    /**

     * Called when setting network selection mode is complete.

     */

    protected void onSetNetworkSelectionModeCompleted() {

    }



    /**

     * Query the radio for the current network selection mode.

     *