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

Merge "Quick fix the getMobileNetworkOperator() in CellIdentity." am: 298d2a46dc

Browse Source 
am: 3ba72e7130

Change-Id: I426e70c17a222773267b0c482c930ccdb0c20b4a
This commit is contained in:
Cassie
2017-12-01 05:40:36 +00:00
committed by android-build-merger
parent 74964ffb8a 3ba72e7130
commit 9afe3b1252
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -202,7 +202,7 @@ public final class CellIdentityGsm implements Parcelable {
* @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;
}
/**

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

@@ -213,7 +213,7 @@ public final class CellIdentityLte implements Parcelable {
* @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;
}
/**

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

@@ -208,7 +208,7 @@ public final class CellIdentityWcdma implements Parcelable {
* @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;
}
/**