summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xapi/current.txt1
-rw-r--r--telephony/java/android/telephony/CellIdentityTdscdma.java7
2 files changed, 8 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 443116f6ffd2..ffb613080b25 100755
--- a/api/current.txt
+++ b/api/current.txt
@@ -42078,6 +42078,7 @@ package android.telephony {
method public int getLac();
method public java.lang.String getMccString();
method public java.lang.String getMncString();
+ method public java.lang.String getMobileNetworkOperator();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.telephony.CellIdentityTdscdma> CREATOR;
}
diff --git a/telephony/java/android/telephony/CellIdentityTdscdma.java b/telephony/java/android/telephony/CellIdentityTdscdma.java
index 5a9e474806a3..bc83de190347 100644
--- a/telephony/java/android/telephony/CellIdentityTdscdma.java
+++ b/telephony/java/android/telephony/CellIdentityTdscdma.java
@@ -109,6 +109,13 @@ public final class CellIdentityTdscdma extends CellIdentity {
}
/**
+ * @return a 5 or 6 character string (MCC+MNC), null if any field is unknown
+ */
+ public String getMobileNetworkOperator() {
+ return (mMccStr == null || mMncStr == null) ? null : mMccStr + mMncStr;
+ }
+
+ /**
* @return 16-bit Location Area Code, 0..65535, INT_MAX if unknown
*/
public int getLac() {