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

Commit 1be1fa0b authored by Nathan Harold's avatar Nathan Harold Committed by android-build-merger
Browse files

Merge "Add getMobileNetworkOperator to CellIdentityTdscdma" am: ac87c0a8 am: 8dc36336 

am: 7695b94e

Change-Id: I2b6a3753b8aaf9e420f114e1c6acc227b38ba8a4
parents f4ae587a 7695b94e

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -42580,6 +42580,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

     */