summaryrefslogtreecommitdiffstats
path: root/telephony/java
diff options
context:
space:
mode:
authorStuart Scott <stuartscott@google.com>2015-01-13 22:43:13 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-01-13 22:43:14 +0000
commite3b0449b0f2fe9f4ed59bd0d209d6b992bfe4372 (patch)
tree9014533968a8e230ba81299c59afdd1e056d5b4f /telephony/java
parent207d7bd3a4aca3478910ec740a0c810868fbeabb (diff)
parent4abdd079498801edf6d144ba6d6965d4cb00e91e (diff)
downloadframeworks_base-e3b0449b0f2fe9f4ed59bd0d209d6b992bfe4372.zip
frameworks_base-e3b0449b0f2fe9f4ed59bd0d209d6b992bfe4372.tar.gz
frameworks_base-e3b0449b0f2fe9f4ed59bd0d209d6b992bfe4372.tar.bz2
Merge "Update javadoc and hide getNameSource and getDataRoaming." into lmp-mr1-dev
Diffstat (limited to 'telephony/java')
-rw-r--r--telephony/java/android/telephony/SubscriptionInfo.java25
1 files changed, 14 insertions, 11 deletions
diff --git a/telephony/java/android/telephony/SubscriptionInfo.java b/telephony/java/android/telephony/SubscriptionInfo.java
index e57f9e3..f3b6910 100644
--- a/telephony/java/android/telephony/SubscriptionInfo.java
+++ b/telephony/java/android/telephony/SubscriptionInfo.java
@@ -129,28 +129,28 @@ public class SubscriptionInfo implements Parcelable {
}
/**
- * Returns the subscription ID.
+ * @return the subscription ID.
*/
public int getSubscriptionId() {
return this.mId;
}
/**
- * Returns the ICC ID.
+ * @return the ICC ID.
*/
public String getIccId() {
return this.mIccId;
}
/**
- * Returns the slot index of this Subscription's SIM card.
+ * @return the slot index of this Subscription's SIM card.
*/
public int getSimSlotIndex() {
return this.mSimSlotIndex;
}
/**
- * Returns the name displayed to the user that identifies this subscription
+ * @return the name displayed to the user that identifies this subscription
*/
public CharSequence getDisplayName() {
return this.mDisplayName;
@@ -165,7 +165,7 @@ public class SubscriptionInfo implements Parcelable {
}
/**
- * Returns the name displayed to the user that identifies Subscription provider name
+ * @return the name displayed to the user that identifies Subscription provider name
*/
public CharSequence getCarrierName() {
return this.mCarrierName;
@@ -180,8 +180,9 @@ public class SubscriptionInfo implements Parcelable {
}
/**
- * Return the source of the name, eg NAME_SOURCE_UNDEFINED, NAME_SOURCE_DEFAULT_SOURCE,
+ * @return the source of the name, eg NAME_SOURCE_UNDEFINED, NAME_SOURCE_DEFAULT_SOURCE,
* NAME_SOURCE_SIM_SOURCE or NAME_SOURCE_USER_INPUT.
+ * @hide
*/
public int getNameSource() {
return this.mNameSource;
@@ -246,35 +247,37 @@ public class SubscriptionInfo implements Parcelable {
}
/**
- * Returns the number of this subscription.
+ * @return the number of this subscription.
*/
public String getNumber() {
return mNumber;
}
/**
- * Return the data roaming value.
+ * @return the data roaming state for this subscription, either DATA_ROAMING_ENABLE or
+ * DATA_ROAMING_DISABLE.
+ * @hide
*/
public int getDataRoaming() {
return this.mDataRoaming;
}
/**
- * Returns the MCC.
+ * @return the MCC.
*/
public int getMcc() {
return this.mMcc;
}
/**
- * Returns the MNC.
+ * @return the MNC.
*/
public int getMnc() {
return this.mMnc;
}
/**
- * Returns the ISO country code
+ * @return the ISO country code
*/
public String getCountryIso() {
return this.mCountryIso;