From 3caa1bd1061df4029951e68d0a04d5e30928701f Mon Sep 17 00:00:00 2001 From: Robert Greenwalt Date: Fri, 14 Jan 2011 16:59:50 -0800 Subject: [PATCH] Moving gsm.NetworkInfo to OperatorInfo NetworkInfo had a bad name collision, wasn't gsm specific and was really about operators. Change-Id: Ic99108a3d0e2b3115f023398f85d9c7e5a3e38be --- .../NetworkInfo.aidl => OperatorInfo.aidl} | 8 ++-- .../NetworkInfo.java => OperatorInfo.java} | 38 +++++++++---------- .../com/android/internal/telephony/Phone.java | 8 ++-- .../internal/telephony/PhoneProxy.java | 3 +- .../com/android/internal/telephony/RIL.java | 12 +++--- .../internal/telephony/cdma/CDMAPhone.java | 3 +- .../internal/telephony/gsm/GSMPhone.java | 9 +++-- .../internal/telephony/sip/SipPhoneBase.java | 3 +- 8 files changed, 42 insertions(+), 42 deletions(-) rename telephony/java/com/android/internal/telephony/{gsm/NetworkInfo.aidl => OperatorInfo.aidl} (79%) rename telephony/java/com/android/internal/telephony/{gsm/NetworkInfo.java => OperatorInfo.java} (78%) diff --git a/telephony/java/com/android/internal/telephony/gsm/NetworkInfo.aidl b/telephony/java/com/android/internal/telephony/OperatorInfo.aidl similarity index 79% rename from telephony/java/com/android/internal/telephony/gsm/NetworkInfo.aidl rename to telephony/java/com/android/internal/telephony/OperatorInfo.aidl index d88d0b721f47a..3ded8dd3bcd7b 100644 --- a/telephony/java/com/android/internal/telephony/gsm/NetworkInfo.aidl +++ b/telephony/java/com/android/internal/telephony/OperatorInfo.aidl @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.android.internal.telephony.gsm; +package com.android.internal.telephony; /** - * Used to indicate that the NetworkInfo object is parcelable to aidl. - * This is a simple effort to make NetworkInfo parcelable rather than + * Used to indicate that the OperatorInfo object is parcelable to aidl. + * This is a simple effort to make OperatorInfo parcelable rather than * trying to make the conventional containing object (AsyncResult), * implement parcelable. This functionality is needed for the * NetworkQueryService to fix 1128695 */ -parcelable NetworkInfo; +parcelable OperatorInfo; diff --git a/telephony/java/com/android/internal/telephony/gsm/NetworkInfo.java b/telephony/java/com/android/internal/telephony/OperatorInfo.java similarity index 78% rename from telephony/java/com/android/internal/telephony/gsm/NetworkInfo.java rename to telephony/java/com/android/internal/telephony/OperatorInfo.java index 04fd13e715a75..1999cb3ada4f7 100644 --- a/telephony/java/com/android/internal/telephony/gsm/NetworkInfo.java +++ b/telephony/java/com/android/internal/telephony/OperatorInfo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.internal.telephony.gsm; +package com.android.internal.telephony; import android.os.Parcel; import android.os.Parcelable; @@ -22,7 +22,7 @@ import android.os.Parcelable; /** * {@hide} */ -public class NetworkInfo implements Parcelable { +public class OperatorInfo implements Parcelable { public enum State { UNKNOWN, AVAILABLE, @@ -30,11 +30,11 @@ public class NetworkInfo implements Parcelable { FORBIDDEN; } - String operatorAlphaLong; - String operatorAlphaShort; - String operatorNumeric; + private String operatorAlphaLong; + private String operatorAlphaShort; + private String operatorNumeric; - State state = State.UNKNOWN; + private State state = State.UNKNOWN; public String @@ -57,7 +57,7 @@ public class NetworkInfo implements Parcelable { return state; } - NetworkInfo(String operatorAlphaLong, + OperatorInfo(String operatorAlphaLong, String operatorAlphaShort, String operatorNumeric, State state) { @@ -70,7 +70,7 @@ public class NetworkInfo implements Parcelable { } - public NetworkInfo(String operatorAlphaLong, + public OperatorInfo(String operatorAlphaLong, String operatorAlphaShort, String operatorNumeric, String stateString) { @@ -98,7 +98,7 @@ public class NetworkInfo implements Parcelable { public String toString() { - return "NetworkInfo " + operatorAlphaLong + return "OperatorInfo " + operatorAlphaLong + "/" + operatorAlphaShort + "/" + operatorNumeric + "/" + state; @@ -106,7 +106,7 @@ public class NetworkInfo implements Parcelable { /** * Parcelable interface implemented below. - * This is a simple effort to make NetworkInfo parcelable rather than + * This is a simple effort to make OperatorInfo parcelable rather than * trying to make the conventional containing object (AsyncResult), * implement parcelable. This functionality is needed for the * NetworkQueryService to fix 1128695. @@ -118,7 +118,7 @@ public class NetworkInfo implements Parcelable { /** * Implement the Parcelable interface. - * Method to serialize a NetworkInfo object. + * Method to serialize a OperatorInfo object. */ public void writeToParcel(Parcel dest, int flags) { dest.writeString(operatorAlphaLong); @@ -129,21 +129,21 @@ public class NetworkInfo implements Parcelable { /** * Implement the Parcelable interface - * Method to deserialize a NetworkInfo object, or an array thereof. + * Method to deserialize a OperatorInfo object, or an array thereof. */ - public static final Creator CREATOR = - new Creator() { - public NetworkInfo createFromParcel(Parcel in) { - NetworkInfo netInfo = new NetworkInfo( + public static final Creator CREATOR = + new Creator() { + public OperatorInfo createFromParcel(Parcel in) { + OperatorInfo opInfo = new OperatorInfo( in.readString(), /*operatorAlphaLong*/ in.readString(), /*operatorAlphaShort*/ in.readString(), /*operatorNumeric*/ (State) in.readSerializable()); /*state*/ - return netInfo; + return opInfo; } - public NetworkInfo[] newArray(int size) { - return new NetworkInfo[size]; + public OperatorInfo[] newArray(int size) { + return new OperatorInfo[size]; } }; } diff --git a/telephony/java/com/android/internal/telephony/Phone.java b/telephony/java/com/android/internal/telephony/Phone.java index d0b5540f494d9..e2896d9bcd26d 100644 --- a/telephony/java/com/android/internal/telephony/Phone.java +++ b/telephony/java/com/android/internal/telephony/Phone.java @@ -27,7 +27,6 @@ import android.telephony.ServiceState; import android.telephony.SignalStrength; import com.android.internal.telephony.DataConnection; -import com.android.internal.telephony.gsm.NetworkInfo; import com.android.internal.telephony.test.SimulatedRadioControl; import java.util.List; @@ -1056,7 +1055,7 @@ public interface Phone { * one of the following members:.

*

    *
  • response.obj.result will be a List of - * com.android.internal.telephony.gsm.NetworkInfo objects, or
    • + * OperatorInfo objects, or *
  • response.obj.exception will be set with an exception * on failure.
    • *
@@ -1070,8 +1069,7 @@ public interface Phone { * @param response The message to dispatch when the network selection * is complete. * - * @see #selectNetworkManually(com.android.internal.telephony.gsm.NetworkInfo, - * android.os.Message ) + * @see #selectNetworkManually(OperatorInfo, android.os.Message ) */ void setNetworkSelectionModeAutomatic(Message response); @@ -1083,7 +1081,7 @@ public interface Phone { * * @see #setNetworkSelectionModeAutomatic(Message) */ - void selectNetworkManually(NetworkInfo network, + void selectNetworkManually(OperatorInfo network, Message response); /** diff --git a/telephony/java/com/android/internal/telephony/PhoneProxy.java b/telephony/java/com/android/internal/telephony/PhoneProxy.java index 219efbb9e50ed..15b23bbe3d2af 100644 --- a/telephony/java/com/android/internal/telephony/PhoneProxy.java +++ b/telephony/java/com/android/internal/telephony/PhoneProxy.java @@ -32,7 +32,6 @@ import android.util.Log; import com.android.internal.telephony.cdma.CDMAPhone; import com.android.internal.telephony.gsm.GSMPhone; -import com.android.internal.telephony.gsm.NetworkInfo; import com.android.internal.telephony.test.SimulatedRadioControl; import java.util.List; @@ -550,7 +549,7 @@ public class PhoneProxy extends Handler implements Phone { mActivePhone.setNetworkSelectionModeAutomatic(response); } - public void selectNetworkManually(NetworkInfo network, Message response) { + public void selectNetworkManually(OperatorInfo network, Message response) { mActivePhone.selectNetworkManually(network, response); } diff --git a/telephony/java/com/android/internal/telephony/RIL.java b/telephony/java/com/android/internal/telephony/RIL.java index ba33454d85d8f..21c88f1a5da03 100644 --- a/telephony/java/com/android/internal/telephony/RIL.java +++ b/telephony/java/com/android/internal/telephony/RIL.java @@ -50,12 +50,12 @@ import android.util.Log; import com.android.internal.telephony.CallForwardInfo; import com.android.internal.telephony.CommandException; import com.android.internal.telephony.DataCallState; -import com.android.internal.telephony.gsm.NetworkInfo; import com.android.internal.telephony.gsm.SmsBroadcastConfigInfo; import com.android.internal.telephony.gsm.SuppServiceNotification; import com.android.internal.telephony.IccCardApplication; import com.android.internal.telephony.IccCardStatus; import com.android.internal.telephony.IccUtils; +import com.android.internal.telephony.OperatorInfo; import com.android.internal.telephony.RILConstants; import com.android.internal.telephony.SmsResponse; import com.android.internal.telephony.cdma.CdmaCallWaitingNotification; @@ -2160,7 +2160,7 @@ public final class RIL extends BaseCommands implements CommandsInterface { case RIL_REQUEST_QUERY_NETWORK_SELECTION_MODE: ret = responseInts(p); break; case RIL_REQUEST_SET_NETWORK_SELECTION_AUTOMATIC: ret = responseVoid(p); break; case RIL_REQUEST_SET_NETWORK_SELECTION_MANUAL: ret = responseVoid(p); break; - case RIL_REQUEST_QUERY_AVAILABLE_NETWORKS : ret = responseNetworkInfos(p); break; + case RIL_REQUEST_QUERY_AVAILABLE_NETWORKS : ret = responseOperatorInfos(p); break; case RIL_REQUEST_DTMF_START: ret = responseVoid(p); break; case RIL_REQUEST_DTMF_STOP: ret = responseVoid(p); break; case RIL_REQUEST_BASEBAND_VERSION: ret = responseString(p); break; @@ -2983,9 +2983,9 @@ public final class RIL extends BaseCommands implements CommandsInterface { } private Object - responseNetworkInfos(Parcel p) { + responseOperatorInfos(Parcel p) { String strings[] = (String [])responseStrings(p); - ArrayList ret; + ArrayList ret; if (strings.length % 4 != 0) { throw new RuntimeException( @@ -2993,11 +2993,11 @@ public final class RIL extends BaseCommands implements CommandsInterface { + strings.length + " strings, expected multible of 4"); } - ret = new ArrayList(strings.length / 4); + ret = new ArrayList(strings.length / 4); for (int i = 0 ; i < strings.length ; i += 4) { ret.add ( - new NetworkInfo( + new OperatorInfo( strings[i+0], strings[i+1], strings[i+2], diff --git a/telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java b/telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java index a1d512100625b..3131ebebc6ad0 100755 --- a/telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java +++ b/telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java @@ -56,6 +56,7 @@ import com.android.internal.telephony.IccFileHandler; import com.android.internal.telephony.IccPhoneBookInterfaceManager; import com.android.internal.telephony.IccSmsInterfaceManager; import com.android.internal.telephony.MmiCode; +import com.android.internal.telephony.OperatorInfo; import com.android.internal.telephony.Phone; import com.android.internal.telephony.PhoneBase; import com.android.internal.telephony.PhoneNotifier; @@ -483,7 +484,7 @@ public class CDMAPhone extends PhoneBase { } public void - selectNetworkManually(com.android.internal.telephony.gsm.NetworkInfo network, + selectNetworkManually(OperatorInfo network, Message response) { Log.e(LOG_TAG, "selectNetworkManually: not possible in CDMA"); } diff --git a/telephony/java/com/android/internal/telephony/gsm/GSMPhone.java b/telephony/java/com/android/internal/telephony/gsm/GSMPhone.java index e8ad0f21cf025..c17197e46f79f 100644 --- a/telephony/java/com/android/internal/telephony/gsm/GSMPhone.java +++ b/telephony/java/com/android/internal/telephony/gsm/GSMPhone.java @@ -62,6 +62,7 @@ import com.android.internal.telephony.IccFileHandler; import com.android.internal.telephony.IccPhoneBookInterfaceManager; import com.android.internal.telephony.IccSmsInterfaceManager; import com.android.internal.telephony.MmiCode; +import com.android.internal.telephony.OperatorInfo; import com.android.internal.telephony.Phone; import com.android.internal.telephony.PhoneBase; import com.android.internal.telephony.PhoneNotifier; @@ -1025,19 +1026,19 @@ public class GSMPhone extends PhoneBase { } public void - selectNetworkManually(com.android.internal.telephony.gsm.NetworkInfo network, + selectNetworkManually(OperatorInfo network, Message response) { // wrap the response message in our own message along with // the operator's id. NetworkSelectMessage nsm = new NetworkSelectMessage(); nsm.message = response; - nsm.operatorNumeric = network.operatorNumeric; - nsm.operatorAlphaLong = network.operatorAlphaLong; + nsm.operatorNumeric = network.getOperatorNumeric(); + nsm.operatorAlphaLong = network.getOperatorAlphaLong(); // get the message Message msg = obtainMessage(EVENT_SET_NETWORK_MANUAL_COMPLETE, nsm); - mCM.setNetworkSelectionModeManual(network.operatorNumeric, msg); + mCM.setNetworkSelectionModeManual(network.getOperatorNumeric(), msg); } public void diff --git a/telephony/java/com/android/internal/telephony/sip/SipPhoneBase.java b/telephony/java/com/android/internal/telephony/sip/SipPhoneBase.java index db9e35ab678c0..9dfc0158a26a5 100755 --- a/telephony/java/com/android/internal/telephony/sip/SipPhoneBase.java +++ b/telephony/java/com/android/internal/telephony/sip/SipPhoneBase.java @@ -38,6 +38,7 @@ import com.android.internal.telephony.IccFileHandler; import com.android.internal.telephony.IccPhoneBookInterfaceManager; import com.android.internal.telephony.IccSmsInterfaceManager; import com.android.internal.telephony.MmiCode; +import com.android.internal.telephony.OperatorInfo; import com.android.internal.telephony.Phone; import com.android.internal.telephony.PhoneBase; import com.android.internal.telephony.PhoneNotifier; @@ -347,7 +348,7 @@ abstract class SipPhoneBase extends PhoneBase { } public void selectNetworkManually( - com.android.internal.telephony.gsm.NetworkInfo network, + OperatorInfo network, Message response) { }