Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b324799 authored by Cassie's avatar Cassie Committed by android-build-merger
Browse files

Merge "Quick fix the getMobileNetworkOperator() in CellIdentity." am: 298d2a46 am: 3ba72e71 

am: 9afe3b12

Change-Id: Ib1db63334919e6d8f605fb2b342265cd71348982
parents d8dd05e7 9afe3b12

telephony/java/android/telephony/CellIdentityGsm.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

    }



    /**

telephony/java/android/telephony/CellIdentityLte.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

    }



    /**

telephony/java/android/telephony/CellIdentityWcdma.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

    }



    /**