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

Merge "Update javadoc and hide getNameSource and getDataRoaming." into lmp-mr1-dev

Browse Source
This commit is contained in:
Stuart Scott
2015-01-13 22:43:13 +00:00
committed by Android (Google) Code Review
parent 207d7bd3a4 4abdd07949
commit e3b0449b0f
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -28619,13 +28619,11 @@ package android.telephony {
method public int describeContents(); method public int describeContents();
method public java.lang.CharSequence getCarrierName(); method public java.lang.CharSequence getCarrierName();
method public java.lang.String getCountryIso(); method public java.lang.String getCountryIso();
method public int getDataRoaming();
method public java.lang.CharSequence getDisplayName(); method public java.lang.CharSequence getDisplayName();
method public java.lang.String getIccId(); method public java.lang.String getIccId();
method public int getIconTint(); method public int getIconTint();
method public int getMcc(); method public int getMcc();
method public int getMnc(); method public int getMnc();
method public int getNameSource();
method public java.lang.String getNumber(); method public java.lang.String getNumber();
method public int getSimSlotIndex(); method public int getSimSlotIndex();
method public int getSubscriptionId(); method public int getSubscriptionId();

25
telephony/java/android/telephony/SubscriptionInfo.java
View File

@@ -129,28 +129,28 @@ public class SubscriptionInfo implements Parcelable {
} }
/** /**
* Returns the subscription ID. * @return the subscription ID.
*/ */
public int getSubscriptionId() { public int getSubscriptionId() {
return this.mId; return this.mId;
} }
/** /**
* Returns the ICC ID. * @return the ICC ID.
*/ */
public String getIccId() { public String getIccId() {
return this.mIccId; 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() { public int getSimSlotIndex() {
return this.mSimSlotIndex; 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() { public CharSequence getDisplayName() {
return this.mDisplayName; 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() { public CharSequence getCarrierName() {
return this.mCarrierName; 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. * NAME_SOURCE_SIM_SOURCE or NAME_SOURCE_USER_INPUT.
* @hide
*/ */
public int getNameSource() { public int getNameSource() {
return this.mNameSource; 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() { public String getNumber() {
return mNumber; 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() { public int getDataRoaming() {
return this.mDataRoaming; return this.mDataRoaming;
} }
/** /**
* Returns the MCC. * @return the MCC.
*/ */
public int getMcc() { public int getMcc() {
return this.mMcc; return this.mMcc;
} }
/** /**
* Returns the MNC. * @return the MNC.
*/ */
public int getMnc() { public int getMnc() {
return this.mMnc; return this.mMnc;
} }
/** /**
* Returns the ISO country code * @return the ISO country code
*/ */
public String getCountryIso() { public String getCountryIso() {
return this.mCountryIso; return this.mCountryIso;