From d062c3221a28fc980177236c0ab5cbb8a790590f Mon Sep 17 00:00:00 2001 From: Cassie Date: Wed, 28 Feb 2018 11:45:29 -0800 Subject: Expand use of 'Str' suffix in CellIdentity to 'String' Expand use of 'Str' suffix in CellIdentity to 'String' to match general usage across Android according to the API Review. Bug: 73751308 Test: Unit test Change-Id: Ib25a06056832be610ff1fb9c025467259eb543ed --- api/current.txt | 16 ++++++++-------- telephony/java/android/telephony/CellIdentityGsm.java | 8 ++++---- telephony/java/android/telephony/CellIdentityLte.java | 8 ++++---- .../java/android/telephony/CellIdentityTdscdma.java | 4 ++-- telephony/java/android/telephony/CellIdentityWcdma.java | 8 ++++---- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/api/current.txt b/api/current.txt index 14f44ecf7e83..5e1cfcd6dbd6 100644 --- a/api/current.txt +++ b/api/current.txt @@ -40216,9 +40216,9 @@ package android.telephony { method public int getCid(); method public int getLac(); method public deprecated int getMcc(); - method public java.lang.String getMccStr(); + method public java.lang.String getMccString(); 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.CharSequence getOperatorAlphaLong(); method public java.lang.CharSequence getOperatorAlphaShort(); @@ -40232,9 +40232,9 @@ package android.telephony { method public int getCi(); method public int getEarfcn(); method public deprecated int getMcc(); - method public java.lang.String getMccStr(); + method public java.lang.String getMccString(); 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.CharSequence getOperatorAlphaLong(); method public java.lang.CharSequence getOperatorAlphaShort(); @@ -40248,8 +40248,8 @@ package android.telephony { method public int getCid(); method public int getCpid(); method public int getLac(); - method public java.lang.String getMccStr(); - method public java.lang.String getMncStr(); + method public java.lang.String getMccString(); + method public java.lang.String getMncString(); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator CREATOR; } @@ -40258,9 +40258,9 @@ package android.telephony { method public int getCid(); method public int getLac(); method public deprecated int getMcc(); - method public java.lang.String getMccStr(); + method public java.lang.String getMccString(); 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.CharSequence getOperatorAlphaLong(); method public java.lang.CharSequence getOperatorAlphaShort(); diff --git a/telephony/java/android/telephony/CellIdentityGsm.java b/telephony/java/android/telephony/CellIdentityGsm.java index f948f812676f..d35eb60916f3 100644 --- a/telephony/java/android/telephony/CellIdentityGsm.java +++ b/telephony/java/android/telephony/CellIdentityGsm.java @@ -120,7 +120,7 @@ public final class CellIdentityGsm extends CellIdentity { /** * @return 3-digit Mobile Country Code, 0..999, Integer.MAX_VALUE if unknown - * @deprecated Use {@link #getMccStr} instead. + * @deprecated Use {@link #getMccString} instead. */ @Deprecated 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 - * @deprecated Use {@link #getMncStr} instead. + * @deprecated Use {@link #getMncString} instead. */ @Deprecated public int getMnc() { @@ -176,14 +176,14 @@ public final class CellIdentityGsm extends CellIdentity { /** * @return Mobile Country Code in string format, null if unknown */ - public String getMccStr() { + public String getMccString() { return mMccStr; } /** * @return Mobile Network Code in string format, null if unknown */ - public String getMncStr() { + public String getMncString() { return mMncStr; } diff --git a/telephony/java/android/telephony/CellIdentityLte.java b/telephony/java/android/telephony/CellIdentityLte.java index 5f1f4489e74e..2b8eb5f3cca6 100644 --- a/telephony/java/android/telephony/CellIdentityLte.java +++ b/telephony/java/android/telephony/CellIdentityLte.java @@ -125,7 +125,7 @@ public final class CellIdentityLte extends CellIdentity { /** * @return 3-digit Mobile Country Code, 0..999, Integer.MAX_VALUE if unknown - * @deprecated Use {@link #getMccStr} instead. + * @deprecated Use {@link #getMccString} instead. */ @Deprecated 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 - * @deprecated Use {@link #getMncStr} instead. + * @deprecated Use {@link #getMncString} instead. */ @Deprecated public int getMnc() { @@ -179,14 +179,14 @@ public final class CellIdentityLte extends CellIdentity { /** * @return Mobile Country Code in string format, null if unknown */ - public String getMccStr() { + public String getMccString() { return mMccStr; } /** * @return Mobile Network Code in string format, null if unknown */ - public String getMncStr() { + public String getMncString() { return mMncStr; } diff --git a/telephony/java/android/telephony/CellIdentityTdscdma.java b/telephony/java/android/telephony/CellIdentityTdscdma.java index 001d19f777fd..992545d62408 100644 --- a/telephony/java/android/telephony/CellIdentityTdscdma.java +++ b/telephony/java/android/telephony/CellIdentityTdscdma.java @@ -86,7 +86,7 @@ public final class CellIdentityTdscdma extends CellIdentity { * Get Mobile Country Code in string format * @return Mobile Country Code in string format, null if unknown */ - public String getMccStr() { + public String getMccString() { return mMccStr; } @@ -94,7 +94,7 @@ public final class CellIdentityTdscdma extends CellIdentity { * Get Mobile Network Code in string format * @return Mobile Network Code in string format, null if unknown */ - public String getMncStr() { + public String getMncString() { return mMncStr; } diff --git a/telephony/java/android/telephony/CellIdentityWcdma.java b/telephony/java/android/telephony/CellIdentityWcdma.java index 1aa1715ee3e8..a5fd7dd97941 100644 --- a/telephony/java/android/telephony/CellIdentityWcdma.java +++ b/telephony/java/android/telephony/CellIdentityWcdma.java @@ -118,7 +118,7 @@ public final class CellIdentityWcdma extends CellIdentity { /** * @return 3-digit Mobile Country Code, 0..999, Integer.MAX_VALUE if unknown - * @deprecated Use {@link #getMccStr} instead. + * @deprecated Use {@link #getMccString} instead. */ @Deprecated 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 - * @deprecated Use {@link #getMncStr} instead. + * @deprecated Use {@link #getMncString} instead. */ @Deprecated public int getMnc() { @@ -160,14 +160,14 @@ public final class CellIdentityWcdma extends CellIdentity { /** * @return Mobile Country Code in string version, null if unknown */ - public String getMccStr() { + public String getMccString() { return mMccStr; } /** * @return Mobile Network Code in string version, null if unknown */ - public String getMncStr() { + public String getMncString() { return mMncStr; } -- cgit v1.2.3-59-g8ed1b