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

Commit 666d1072 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Make getOperatorAlphaLongRaw/getOperatorAlphaShortRaw as public APIs"... 

Merge "Make getOperatorAlphaLongRaw/getOperatorAlphaShortRaw as public APIs" into rvc-dev am: 27f08dad

Change-Id: I76fce0cf1926cc2fac2c36009b9b507f7368213d
parents 25dc179c 27f08dad

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -47778,7 +47778,9 @@ package android.telephony { 
    method public boolean getIsManualSelection();

    method @NonNull public java.util.List<android.telephony.NetworkRegistrationInfo> getNetworkRegistrationInfoList();

    method public String getOperatorAlphaLong();

    method @Nullable public String getOperatorAlphaLongRaw();

    method public String getOperatorAlphaShort();

    method @Nullable public String getOperatorAlphaShortRaw();

    method public String getOperatorNumeric();

    method public boolean getRoaming();

    method public int getState();

api/system-current.txt

+0 −2
Original line number Diff line number Diff line
@@ -11437,8 +11437,6 @@ package android.telephony { 
    method @NonNull public java.util.List<android.telephony.NetworkRegistrationInfo> getNetworkRegistrationInfoListForDomain(int);

    method @NonNull public java.util.List<android.telephony.NetworkRegistrationInfo> getNetworkRegistrationInfoListForTransportType(int);

    method public int getNrFrequencyRange();

    method @Nullable public String getOperatorAlphaLongRaw();

    method @Nullable public String getOperatorAlphaShortRaw();

    method @NonNull public static android.telephony.ServiceState newFromBundle(@NonNull android.os.Bundle);

    field public static final int ROAMING_TYPE_DOMESTIC = 2; // 0x2

    field public static final int ROAMING_TYPE_INTERNATIONAL = 3; // 0x3

telephony/java/android/telephony/ServiceState.java

+4 −4
Original line number Diff line number Diff line
@@ -2022,11 +2022,11 @@ public class ServiceState implements Parcelable { 
    /**

     * The current registered raw data network operator name in long alphanumeric format.

     *

     * The long format can be up to 16 characters long.

     *

     * @return long raw name of operator, null if unregistered or unknown

     * @hide

     */

    @Nullable

    @SystemApi

    public String getOperatorAlphaLongRaw() {

        return mOperatorAlphaLongRaw;

    }
@@ -2041,11 +2041,11 @@ public class ServiceState implements Parcelable { 
    /**

     * The current registered raw data network operator name in short alphanumeric format.

     *

     * The short format can be up to 8 characters long.

     *

     * @return short raw name of operator, null if unregistered or unknown

     * @hide

     */

    @Nullable

    @SystemApi

    public String getOperatorAlphaShortRaw() {

        return mOperatorAlphaShortRaw;

    }