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

Merge "Expand use of 'Str' suffix in CellIdentity to 'String'"

Browse Source
This commit is contained in:
Cassie Han
2018-03-02 22:15:56 +00:00
committed by Gerrit Code Review
parent d846adac83 d062c3221a
commit d622eacb9e
5 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
api/current.txt
View File

@@ -40233,9 +40233,9 @@ package android.telephony {
method public int getCid(); method public int getCid();
method public int getLac(); method public int getLac();
method public deprecated int getMcc(); method public deprecated int getMcc();
method public java.lang.String getMccStr(); method public java.lang.String getMccString();
method public deprecated int getMnc(); method public deprecated int getMnc();
method public java.lang.String getMncStr(); method public java.lang.String getMncString();
method public java.lang.String getMobileNetworkOperator(); method public java.lang.String getMobileNetworkOperator();
method public java.lang.CharSequence getOperatorAlphaLong(); method public java.lang.CharSequence getOperatorAlphaLong();
method public java.lang.CharSequence getOperatorAlphaShort(); method public java.lang.CharSequence getOperatorAlphaShort();
@@ -40249,9 +40249,9 @@ package android.telephony {
method public int getCi(); method public int getCi();
method public int getEarfcn(); method public int getEarfcn();
method public deprecated int getMcc(); method public deprecated int getMcc();
method public java.lang.String getMccStr(); method public java.lang.String getMccString();
method public deprecated int getMnc(); method public deprecated int getMnc();
method public java.lang.String getMncStr(); method public java.lang.String getMncString();
method public java.lang.String getMobileNetworkOperator(); method public java.lang.String getMobileNetworkOperator();
method public java.lang.CharSequence getOperatorAlphaLong(); method public java.lang.CharSequence getOperatorAlphaLong();
method public java.lang.CharSequence getOperatorAlphaShort(); method public java.lang.CharSequence getOperatorAlphaShort();
@@ -40265,8 +40265,8 @@ package android.telephony {
method public int getCid(); method public int getCid();
method public int getCpid(); method public int getCpid();
method public int getLac(); method public int getLac();
method public java.lang.String getMccStr(); method public java.lang.String getMccString();
method public java.lang.String getMncStr(); method public java.lang.String getMncString();
method public void writeToParcel(android.os.Parcel, int); method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.telephony.CellIdentityTdscdma> CREATOR; field public static final android.os.Parcelable.Creator<android.telephony.CellIdentityTdscdma> CREATOR;
} }
@@ -40275,9 +40275,9 @@ package android.telephony {
method public int getCid(); method public int getCid();
method public int getLac(); method public int getLac();
method public deprecated int getMcc(); method public deprecated int getMcc();
method public java.lang.String getMccStr(); method public java.lang.String getMccString();
method public deprecated int getMnc(); method public deprecated int getMnc();
method public java.lang.String getMncStr(); method public java.lang.String getMncString();
method public java.lang.String getMobileNetworkOperator(); method public java.lang.String getMobileNetworkOperator();
method public java.lang.CharSequence getOperatorAlphaLong(); method public java.lang.CharSequence getOperatorAlphaLong();
method public java.lang.CharSequence getOperatorAlphaShort(); method public java.lang.CharSequence getOperatorAlphaShort();

8
telephony/java/android/telephony/CellIdentityGsm.java
View File

@@ -120,7 +120,7 @@ public final class CellIdentityGsm extends CellIdentity {
/** /**
* @return 3-digit Mobile Country Code, 0..999, Integer.MAX_VALUE if unknown * @return 3-digit Mobile Country Code, 0..999, Integer.MAX_VALUE if unknown
* @deprecated Use {@link #getMccStr} instead. * @deprecated Use {@link #getMccString} instead.
*/ */
@Deprecated @Deprecated
public int getMcc() { public int getMcc() {
@@ -129,7 +129,7 @@ public final class CellIdentityGsm extends CellIdentity {
/** /**
* @return 2 or 3-digit Mobile Network Code, 0..999, Integer.MAX_VALUE if unknown * @return 2 or 3-digit Mobile Network Code, 0..999, Integer.MAX_VALUE if unknown
* @deprecated Use {@link #getMncStr} instead. * @deprecated Use {@link #getMncString} instead.
*/ */
@Deprecated @Deprecated
public int getMnc() { public int getMnc() {
@@ -176,14 +176,14 @@ public final class CellIdentityGsm extends CellIdentity {
/** /**
* @return Mobile Country Code in string format, null if unknown * @return Mobile Country Code in string format, null if unknown
*/ */
public String getMccStr() { public String getMccString() {
return mMccStr; return mMccStr;
} }
/** /**
* @return Mobile Network Code in string format, null if unknown * @return Mobile Network Code in string format, null if unknown
*/ */
public String getMncStr() { public String getMncString() {
return mMncStr; return mMncStr;
} }

8
telephony/java/android/telephony/CellIdentityLte.java
View File

@@ -125,7 +125,7 @@ public final class CellIdentityLte extends CellIdentity {
/** /**
* @return 3-digit Mobile Country Code, 0..999, Integer.MAX_VALUE if unknown * @return 3-digit Mobile Country Code, 0..999, Integer.MAX_VALUE if unknown
* @deprecated Use {@link #getMccStr} instead. * @deprecated Use {@link #getMccString} instead.
*/ */
@Deprecated @Deprecated
public int getMcc() { public int getMcc() {
@@ -134,7 +134,7 @@ public final class CellIdentityLte extends CellIdentity {
/** /**
* @return 2 or 3-digit Mobile Network Code, 0..999, Integer.MAX_VALUE if unknown * @return 2 or 3-digit Mobile Network Code, 0..999, Integer.MAX_VALUE if unknown
* @deprecated Use {@link #getMncStr} instead. * @deprecated Use {@link #getMncString} instead.
*/ */
@Deprecated @Deprecated
public int getMnc() { public int getMnc() {
@@ -179,14 +179,14 @@ public final class CellIdentityLte extends CellIdentity {
/** /**
* @return Mobile Country Code in string format, null if unknown * @return Mobile Country Code in string format, null if unknown
*/ */
public String getMccStr() { public String getMccString() {
return mMccStr; return mMccStr;
} }
/** /**
* @return Mobile Network Code in string format, null if unknown * @return Mobile Network Code in string format, null if unknown
*/ */
public String getMncStr() { public String getMncString() {
return mMncStr; return mMncStr;
} }

4
telephony/java/android/telephony/CellIdentityTdscdma.java
View File

@@ -86,7 +86,7 @@ public final class CellIdentityTdscdma extends CellIdentity {
* Get Mobile Country Code in string format * Get Mobile Country Code in string format
* @return Mobile Country Code in string format, null if unknown * @return Mobile Country Code in string format, null if unknown
*/ */
public String getMccStr() { public String getMccString() {
return mMccStr; return mMccStr;
} }
@@ -94,7 +94,7 @@ public final class CellIdentityTdscdma extends CellIdentity {
* Get Mobile Network Code in string format * Get Mobile Network Code in string format
* @return Mobile Network Code in string format, null if unknown * @return Mobile Network Code in string format, null if unknown
*/ */
public String getMncStr() { public String getMncString() {
return mMncStr; return mMncStr;
} }

8
telephony/java/android/telephony/CellIdentityWcdma.java
View File

@@ -118,7 +118,7 @@ public final class CellIdentityWcdma extends CellIdentity {
/** /**
* @return 3-digit Mobile Country Code, 0..999, Integer.MAX_VALUE if unknown * @return 3-digit Mobile Country Code, 0..999, Integer.MAX_VALUE if unknown
* @deprecated Use {@link #getMccStr} instead. * @deprecated Use {@link #getMccString} instead.
*/ */
@Deprecated @Deprecated
public int getMcc() { public int getMcc() {
@@ -127,7 +127,7 @@ public final class CellIdentityWcdma extends CellIdentity {
/** /**
* @return 2 or 3-digit Mobile Network Code, 0..999, Integer.MAX_VALUE if unknown * @return 2 or 3-digit Mobile Network Code, 0..999, Integer.MAX_VALUE if unknown
* @deprecated Use {@link #getMncStr} instead. * @deprecated Use {@link #getMncString} instead.
*/ */
@Deprecated @Deprecated
public int getMnc() { public int getMnc() {
@@ -160,14 +160,14 @@ public final class CellIdentityWcdma extends CellIdentity {
/** /**
* @return Mobile Country Code in string version, null if unknown * @return Mobile Country Code in string version, null if unknown
*/ */
public String getMccStr() { public String getMccString() {
return mMccStr; return mMccStr;
} }
/** /**
* @return Mobile Network Code in string version, null if unknown * @return Mobile Network Code in string version, null if unknown
*/ */
public String getMncStr() { public String getMncString() {
return mMncStr; return mMncStr;
} }