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

Commit 84d51c67 authored by Sungmin Choi's avatar Sungmin Choi Committed by Robert Greenwalt
Browse files

Fix automatic network selection mode issue 

Currently, if user selects "Choose automatically"
in Settings > More > Cellular networks > Network operators,
dialog is shown infinitely, and user can not cancel with back key.
Because COMPLETE message is not sent in case of already automatic mode.
To fix it, change to send COMPLETE message even if already automatic mode.

Bug: 24270612
Change-Id: Id312ac846c95a32337aebbd815de03416f2b614f
parent 9cbd33d7

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

+14 −11
Original line number Diff line number Diff line
@@ -1019,7 +1019,7 @@ public abstract class PhoneBase extends Handler implements Phone { 
                // send the setting on error

            }

        }

        if (doAutomatic) {



        // wrap the response message in our own message along with

        // an empty string (to indicate automatic selection) for the

        // operator's id.
@@ -1029,13 +1029,16 @@ public abstract class PhoneBase extends Handler implements Phone { 
        nsm.operatorAlphaLong = "";

        nsm.operatorAlphaShort = "";



        if (doAutomatic) {

            Message msg = obtainMessage(EVENT_SET_NETWORK_AUTOMATIC_COMPLETE, nsm);

            mCi.setNetworkSelectionModeAutomatic(msg);



            updateSavedNetworkOperator(nsm);

        } else {

            Rlog.d(LOG_TAG, "setNetworkSelectionModeAutomatic - already auto, ignoring");

            ar.userObj = nsm;

            handleSetSelectNetwork(ar);

        }



        updateSavedNetworkOperator(nsm);

    }



    @Override