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

Commit 7695b94e authored by Nathan Harold's avatar Nathan Harold Committed by android-build-merger
Browse files

Merge "Add getMobileNetworkOperator to CellIdentityTdscdma" am: ac87c0a8 

am: 8dc36336

Change-Id: Ic7d0e0bc7c52a6689fb88e27f5f6d5aa6c75869e
parents a5b038fb 8dc36336

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -42078,6 +42078,7 @@ package android.telephony { 
    method public int getLac();

    method public java.lang.String getMccString();

    method public java.lang.String getMncString();

    method public java.lang.String getMobileNetworkOperator();

    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<android.telephony.CellIdentityTdscdma> CREATOR;

  }

telephony/java/android/telephony/CellIdentityTdscdma.java

+7 −0
Original line number Diff line number Diff line
@@ -108,6 +108,13 @@ public final class CellIdentityTdscdma extends CellIdentity { 
        return mMncStr;

    }



    /**

     * @return a 5 or 6 character string (MCC+MNC), null if any field is unknown

     */

    public String getMobileNetworkOperator() {

        return (mMccStr == null || mMncStr == null) ? null : mMccStr + mMncStr;

    }



    /**

     * @return 16-bit Location Area Code, 0..65535, INT_MAX if unknown

     */