From b799fcdd696866c2b390fb66055b5146eaf5e183 Mon Sep 17 00:00:00 2001 From: Cassie Date: Thu, 30 Nov 2017 15:54:51 -0800 Subject: [PATCH] Quick fix the getMobileNetworkOperator() in CellIdentity. Bug: 69915536 Test: Basic telephony sanity Change-Id: Iac8222055aea95fbb5334876124ce9d1571ae2f6 --- telephony/java/android/telephony/CellIdentityGsm.java | 2 +- telephony/java/android/telephony/CellIdentityLte.java | 2 +- telephony/java/android/telephony/CellIdentityWcdma.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/telephony/java/android/telephony/CellIdentityGsm.java b/telephony/java/android/telephony/CellIdentityGsm.java index c9684062b6c3..376e6aa77155 100644 --- a/telephony/java/android/telephony/CellIdentityGsm.java +++ b/telephony/java/android/telephony/CellIdentityGsm.java @@ -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; } /** diff --git a/telephony/java/android/telephony/CellIdentityLte.java b/telephony/java/android/telephony/CellIdentityLte.java index 825dcc336eb9..6ca5daf63375 100644 --- a/telephony/java/android/telephony/CellIdentityLte.java +++ b/telephony/java/android/telephony/CellIdentityLte.java @@ -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; } /** diff --git a/telephony/java/android/telephony/CellIdentityWcdma.java b/telephony/java/android/telephony/CellIdentityWcdma.java index e74b5701233f..e4bb4f297a3f 100644 --- a/telephony/java/android/telephony/CellIdentityWcdma.java +++ b/telephony/java/android/telephony/CellIdentityWcdma.java @@ -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; } /** -- 2.11.0