Merge "Add getMobileNetworkOperator to CellIdentityTdscdma" am: ac87c0a884

am: 8dc36336d5

Change-Id: Ic7d0e0bc7c52a6689fb88e27f5f6d5aa6c75869e
This commit is contained in:
Nathan Harold
2018-10-24 16:28:49 -07:00
committed by android-build-merger
2 changed files with 8 additions and 0 deletions

View File

@@ -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;
}

View File

@@ -108,6 +108,13 @@ public final class CellIdentityTdscdma extends CellIdentity {
return mMncStr;
}
/**
* @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
*/