| commit | 9afe3b1252c8600d9864494cbe225d1f3ac7b477 | [log] [tgz] |
|---|---|---|
| author | Cassie <xih@google.com> | Fri Dec 01 05:40:36 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Dec 01 05:40:36 2017 +0000 |
| tree | 8fbfabacdbc10056024da00d218cb03db1f04c05 | |
| parent | 74964ffb8a5ba2415d5ca3fad6384aeda2de3392 [diff] | |
| parent | 3ba72e7130abc52b206404fa1ed59ab52f675686 [diff] |
Merge "Quick fix the getMobileNetworkOperator() in CellIdentity." am: 298d2a46dc am: 3ba72e7130 Change-Id: I426e70c17a222773267b0c482c930ccdb0c20b4a
diff --git a/telephony/java/android/telephony/CellIdentityGsm.java b/telephony/java/android/telephony/CellIdentityGsm.java index c968406..376e6aa 100644 --- a/telephony/java/android/telephony/CellIdentityGsm.java +++ b/telephony/java/android/telephony/CellIdentityGsm.java
@@ -202,7 +202,7 @@ * @return a 5 or 6 character string (MCC+MNC), null if any field is unknown */ public String getMobileNetworkOperator() { - return (mMncStr == null || mMncStr == null) ? null : mMccStr + mMncStr; + return (mMccStr == null || mMncStr == null) ? null : mMccStr + mMncStr; } /**
diff --git a/telephony/java/android/telephony/CellIdentityLte.java b/telephony/java/android/telephony/CellIdentityLte.java index 825dcc3..6ca5daf6 100644 --- a/telephony/java/android/telephony/CellIdentityLte.java +++ b/telephony/java/android/telephony/CellIdentityLte.java
@@ -213,7 +213,7 @@ * @return a 5 or 6 character string (MCC+MNC), null if any field is unknown */ public String getMobileNetworkOperator() { - return (mMncStr == null || mMncStr == null) ? null : mMccStr + mMncStr; + return (mMccStr == null || mMncStr == null) ? null : mMccStr + mMncStr; } /**
diff --git a/telephony/java/android/telephony/CellIdentityWcdma.java b/telephony/java/android/telephony/CellIdentityWcdma.java index e74b570..e4bb4f2 100644 --- a/telephony/java/android/telephony/CellIdentityWcdma.java +++ b/telephony/java/android/telephony/CellIdentityWcdma.java
@@ -208,7 +208,7 @@ * @return a 5 or 6 character string (MCC+MNC), null if any field is unknown */ public String getMobileNetworkOperator() { - return (mMncStr == null || mMncStr == null) ? null : mMccStr + mMncStr; + return (mMccStr == null || mMncStr == null) ? null : mMccStr + mMncStr; } /**