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

Commit 61e1386b authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

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

Merge "Merge "Quick fix the getMobileNetworkOperator() in CellIdentity." am: 298d2a46 am: 3ba72e71 am: 9afe3b12"
parents 3326b3f4 8b324799

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;

    }



    /**