Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add operator name in network selection.

Browse Source 
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
This commit is contained in:
johnwang
2009-08-10 17:05:29 -07:00
parent 597f2b7022
commit c6f79ce6bc
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
telephony/java/com/android/internal/telephony/PhoneBase.java
View File

@@ -59,10 +59,13 @@ 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)
// 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";
//***** Event Constants

7
telephony/java/com/android/internal/telephony/gsm/GSMPhone.java
View File

@@ -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()) {