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

Commit c6f79ce6 authored by johnwang's avatar johnwang
Browse files

Add operator name in network selection. 

Save the operator name during network selection. The name will be used by UI to provide network selection notification. See bug 1414247.

	modified:   java/com/android/internal/telephony/PhoneBase.java
	modified:   java/com/android/internal/telephony/gsm/GSMPhone.java
parent 597f2b70

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

+5 −2
Original line number Diff line number Diff line
@@ -59,8 +59,11 @@ public abstract class PhoneBase implements Phone { 
    private static final String LOG_TAG = "PHONE";

    private static final boolean LOCAL_DEBUG = true;



    // Key used to read and write the saved network selection value

    // Key used to read and write the saved network selection numeric value

    public static final String NETWORK_SELECTION_KEY = "network_selection_key";

    // Key used to read and write the saved network selection operator name

    public static final String NETWORK_SELECTION_NAME_KEY = "network_selection_name_key";





    // Key used to read/write "disable data connection on boot" pref (used for testing)

    public static final String DATA_DISABLED_ON_BOOT_KEY = "disabled_on_boot_key";

telephony/java/com/android/internal/telephony/gsm/GSMPhone.java

+6 −1
Original line number Diff line number Diff line
@@ -1032,11 +1032,13 @@ public class GSMPhone extends PhoneBase { 
    /**

     * Small container class used to hold information relevant to

     * the carrier selection process. operatorNumeric can be ""

     * if we are looking for automatic selection.

     * if we are looking for automatic selection. operatorAlphaLong is the

     * corresponding operator name.

     */

    private static class NetworkSelectMessage {

        public Message message;

        public String operatorNumeric;

        public String operatorAlphaLong;

    }



    public void
@@ -1047,6 +1049,7 @@ public class GSMPhone extends PhoneBase { 
        NetworkSelectMessage nsm = new NetworkSelectMessage();

        nsm.message = response;

        nsm.operatorNumeric = "";

        nsm.operatorAlphaLong = "";



        // get the message

        Message msg = h.obtainMessage(EVENT_SET_NETWORK_AUTOMATIC_COMPLETE, nsm);
@@ -1064,6 +1067,7 @@ public class GSMPhone extends PhoneBase { 
        NetworkSelectMessage nsm = new NetworkSelectMessage();

        nsm.message = response;

        nsm.operatorNumeric = network.operatorNumeric;

        nsm.operatorAlphaLong = network.operatorAlphaLong;



        // get the message

        Message msg = h.obtainMessage(EVENT_SET_NETWORK_MANUAL_COMPLETE, nsm);
@@ -1499,6 +1503,7 @@ public class GSMPhone extends PhoneBase { 
        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getContext());

        SharedPreferences.Editor editor = sp.edit();

        editor.putString(NETWORK_SELECTION_KEY, nsm.operatorNumeric);

        editor.putString(NETWORK_SELECTION_NAME_KEY, nsm.operatorAlphaLong);



        // commit and log the result.

        if (! editor.commit()) {