Merge "Expose the following ServiceState API as system APIs"

This commit is contained in:
Jayachandran Chinnakkannu
2019-11-15 07:08:34 +00:00
committed by Gerrit Code Review
2 changed files with 8 additions and 0 deletions

View File

@@ -8017,6 +8017,8 @@ package android.telephony {
method @NonNull public java.util.List<android.telephony.NetworkRegistrationInfo> getNetworkRegistrationInfoList(); method @NonNull public java.util.List<android.telephony.NetworkRegistrationInfo> getNetworkRegistrationInfoList();
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 @Nullable public String getOperatorAlphaLongRaw();
method @Nullable public String getOperatorAlphaShortRaw();
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
field public static final int ROAMING_TYPE_NOT_ROAMING = 0; // 0x0 field public static final int ROAMING_TYPE_NOT_ROAMING = 0; // 0x0

View File

@@ -1975,8 +1975,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.
* *
* @return long raw name of operator, null if unregistered or unknown
* @hide * @hide
*/ */
@Nullable
@SystemApi
public String getOperatorAlphaLongRaw() { public String getOperatorAlphaLongRaw() {
return mOperatorAlphaLongRaw; return mOperatorAlphaLongRaw;
} }
@@ -1991,8 +1994,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.
* *
* @return short raw name of operator, null if unregistered or unknown
* @hide * @hide
*/ */
@Nullable
@SystemApi
public String getOperatorAlphaShortRaw() { public String getOperatorAlphaShortRaw() {
return mOperatorAlphaShortRaw; return mOperatorAlphaShortRaw;
} }