am 2d68b428: am e3b0449b: Merge "Update javadoc and hide getNameSource and getDataRoaming." into lmp-mr1-dev automerge: dfb99e8
* commit '2d68b428b06df4f91ffd12c01ccbac61ce9cb163':
Update javadoc and hide getNameSource and getDataRoaming.
diff --git a/api/current.txt b/api/current.txt
index 761a7bb..38c2689 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -28892,13 +28892,11 @@
method public int describeContents();
method public java.lang.CharSequence getCarrierName();
method public java.lang.String getCountryIso();
- method public int getDataRoaming();
method public java.lang.CharSequence getDisplayName();
method public java.lang.String getIccId();
method public int getIconTint();
method public int getMcc();
method public int getMnc();
- method public int getNameSource();
method public java.lang.String getNumber();
method public int getSimSlotIndex();
method public int getSubscriptionId();
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 @@
}
/**
- * 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 @@
}
/**
- * 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 @@
}
/**
- * 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 @@
}
/**
- * 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;