Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make getOperatorAlphaLongRaw/getOperatorAlphaShortRaw as public APIs" into rvc-dev

Browse Source
This commit is contained in:
Jayachandran Chinnakkannu
2020-03-02 20:01:34 +00:00
committed by Android (Google) Code Review
parent 3b2dccfcc3 86c4ed7c78
commit 27f08dad66
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -47778,7 +47778,9 @@ package android.telephony {
method public boolean getIsManualSelection(); method public boolean getIsManualSelection();
method @NonNull public java.util.List<android.telephony.NetworkRegistrationInfo> getNetworkRegistrationInfoList(); method @NonNull public java.util.List<android.telephony.NetworkRegistrationInfo> getNetworkRegistrationInfoList();
method public String getOperatorAlphaLong(); method public String getOperatorAlphaLong();
method @Nullable public String getOperatorAlphaLongRaw();
method public String getOperatorAlphaShort(); method public String getOperatorAlphaShort();
method @Nullable public String getOperatorAlphaShortRaw();
method public String getOperatorNumeric(); method public String getOperatorNumeric();
method public boolean getRoaming(); method public boolean getRoaming();
method public int getState(); method public int getState();

2
api/system-current.txt
View File

@@ -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> getNetworkRegistrationInfoListForDomain(int);
method @NonNull public java.util.List<android.telephony.NetworkRegistrationInfo> getNetworkRegistrationInfoListForTransportType(int); method @NonNull public java.util.List<android.telephony.NetworkRegistrationInfo> getNetworkRegistrationInfoListForTransportType(int);
method public int getNrFrequencyRange(); 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); 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_DOMESTIC = 2; // 0x2
field public static final int ROAMING_TYPE_INTERNATIONAL = 3; // 0x3 field public static final int ROAMING_TYPE_INTERNATIONAL = 3; // 0x3

8
telephony/java/android/telephony/ServiceState.java
View File

@@ -2022,11 +2022,11 @@ public class ServiceState implements Parcelable {
/** /**
* The current registered raw data network operator name in long alphanumeric format. * 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 * @return long raw name of operator, null if unregistered or unknown
* @hide
*/ */
@Nullable @Nullable
@SystemApi
public String getOperatorAlphaLongRaw() { public String getOperatorAlphaLongRaw() {
return mOperatorAlphaLongRaw; return mOperatorAlphaLongRaw;
} }
@@ -2041,11 +2041,11 @@ public class ServiceState implements Parcelable {
/** /**
* The current registered raw data network operator name in short alphanumeric format. * 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 * @return short raw name of operator, null if unregistered or unknown
* @hide
*/ */
@Nullable @Nullable
@SystemApi
public String getOperatorAlphaShortRaw() { public String getOperatorAlphaShortRaw() {
return mOperatorAlphaShortRaw; return mOperatorAlphaShortRaw;
} }