From 390de220248d05ccb9dc10a197700ad3c1595937 Mon Sep 17 00:00:00 2001 From: Jake Hamby Date: Mon, 10 May 2010 18:46:45 -0700 Subject: Fix some typos and other cosmetic cleanups in telephony framework. - Fix typos in Javadoc and comments. - Fix Javadoc @link references to other classes/methods. - Rename MISSING_UKNOWN_APN to MISSING_UNKNOWN_APN in DataConnection. - Remove unused (and misspelled) RETRYIES_* consts in RetryManager. Change-Id: I3b44ac8320d6c1e4c350be600c7ef266aaf735e4 --- telephony/java/android/telephony/ServiceState.java | 38 ++++++++++++---------- .../java/android/telephony/gsm/SmsManager.java | 2 +- 2 files changed, 21 insertions(+), 19 deletions(-) (limited to 'telephony/java/android') diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java index 446bbc2..71e258f 100644 --- a/telephony/java/android/telephony/ServiceState.java +++ b/telephony/java/android/telephony/ServiceState.java @@ -57,7 +57,7 @@ public class ServiceState implements Parcelable { public static final int STATE_EMERGENCY_ONLY = 2; /** - * Radio of telephony is explictly powered off. + * Radio of telephony is explicitly powered off. */ public static final int STATE_POWER_OFF = 3; @@ -215,7 +215,8 @@ public class ServiceState implements Parcelable { return 0; } - public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { + public static final Parcelable.Creator CREATOR = + new Parcelable.Creator() { public ServiceState createFromParcel(Parcel in) { return new ServiceState(in); } @@ -226,7 +227,7 @@ public class ServiceState implements Parcelable { }; /** - * Get current servcie state of phone + * Get current service state of phone * * @see #STATE_IN_SERVICE * @see #STATE_OUT_OF_SERVICE @@ -278,10 +279,10 @@ public class ServiceState implements Parcelable { } /** - * Get current registered operator name in long alphanumeric format + * Get current registered operator name in long alphanumeric format. * - * In GSM/UMTS, long format can be upto 16 characters long - * In CDMA, returns the ERI text, if set, otherwise the ONS + * In GSM/UMTS, long format can be up to 16 characters long. + * In CDMA, returns the ERI text, if set. Otherwise, returns the ONS. * * @return long name of operator, null if unregistered or unknown */ @@ -290,9 +291,9 @@ public class ServiceState implements Parcelable { } /** - * Get current registered operator name in short lphanumeric format + * Get current registered operator name in short alphanumeric format. * - * In GSM/UMST, short format can be upto 8 characters long + * In GSM/UMTS, short format can be up to 8 characters long. * * @return short name of operator, null if unregistered or unknown */ @@ -301,12 +302,13 @@ public class ServiceState implements Parcelable { } /** - * Get current registered operator numeric id + * Get current registered operator numeric id. * * In GSM/UMTS, numeric format is 3 digit country code plus 2 or 3 digit - * network code + * network code. * - * The country code can be decoded using MccTable.countryCodeForMcc() + * The country code can be decoded using + * {@link com.android.internal.telephony.MccTable#countryCodeForMcc(int)}. * * @return numeric format of operator, null if unregistered or unknown */ @@ -315,7 +317,7 @@ public class ServiceState implements Parcelable { } /** - * Get current network selection mode + * Get current network selection mode. * * @return true if manual mode, false if automatic mode */ @@ -442,7 +444,7 @@ public class ServiceState implements Parcelable { mCdmaEriIconMode = -1; } - // TODO - can't this be combined with the above func.. + // TODO - can't this be combined with the above method? public void setStateOff() { mState = STATE_POWER_OFF; mRoaming = false; @@ -503,8 +505,8 @@ public class ServiceState implements Parcelable { } /** - * In CDMA mOperatorAlphaLong can be set from the ERI - * text, this is done from the CDMAPhone and not from the CdmaServiceStateTracker + * In CDMA, mOperatorAlphaLong can be set from the ERI text. + * This is done from the CDMAPhone and not from the CdmaServiceStateTracker. * * @hide */ @@ -517,7 +519,7 @@ public class ServiceState implements Parcelable { } /** - * Test whether two objects hold the same data values or both are null + * Test whether two objects hold the same data values or both are null. * * @param a first obj * @param b second obj @@ -528,7 +530,7 @@ public class ServiceState implements Parcelable { } /** - * Set ServiceState based on intent notifier map + * Set ServiceState based on intent notifier map. * * @param m intent notifier map * @hide @@ -549,7 +551,7 @@ public class ServiceState implements Parcelable { } /** - * Set intent notifier Bundle based on service state + * Set intent notifier Bundle based on service state. * * @param m intent notifier Bundle * @hide diff --git a/telephony/java/android/telephony/gsm/SmsManager.java b/telephony/java/android/telephony/gsm/SmsManager.java index 241c485..3b75298 100644 --- a/telephony/java/android/telephony/gsm/SmsManager.java +++ b/telephony/java/android/telephony/gsm/SmsManager.java @@ -56,7 +56,7 @@ import java.util.ArrayList; * the current default SMSC * @param text the body of the message to send * @param sentIntent if not NULL this PendingIntent is - * broadcast when the message is sucessfully sent, or failed. + * broadcast when the message is successfully sent, or failed. * The result code will be Activity.RESULT_OK for success, * or one of these errors: * RESULT_ERROR_GENERIC_FAILURE -- cgit v1.1 From e25863c9093d3f60a1f6feab1d17d38946a8d020 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Queru Date: Tue, 18 May 2010 11:54:42 -0700 Subject: fix build Change-Id: I86ee569ec81e6c690f7697237be7d94307014142 --- telephony/java/android/telephony/ServiceState.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'telephony/java/android') diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java index 71e258f..bf3dcc7 100644 --- a/telephony/java/android/telephony/ServiceState.java +++ b/telephony/java/android/telephony/ServiceState.java @@ -307,10 +307,11 @@ public class ServiceState implements Parcelable { * In GSM/UMTS, numeric format is 3 digit country code plus 2 or 3 digit * network code. * + * @return numeric format of operator, null if unregistered or unknown + */ + /* * The country code can be decoded using * {@link com.android.internal.telephony.MccTable#countryCodeForMcc(int)}. - * - * @return numeric format of operator, null if unregistered or unknown */ public String getOperatorNumeric() { return mOperatorNumeric; -- cgit v1.1