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

Merge "Expose the following as system APIs" am: 119d0fa9ac

Browse Source 
am: 8dc9114a9d

Change-Id: I5416b90d04148c4d388496b60052df7012a2754f
This commit is contained in:
Jayachandran Chinnakkannu
2019-11-15 00:24:48 -08:00
committed by android-build-merger
parent 8a0d0dffb9 8dc9114a9d
commit d1844418a0
4 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/system-current.txt
View File

@@ -7663,6 +7663,7 @@ package android.telephony {
public final class DataSpecificRegistrationInfo implements android.os.Parcelable {
method public int describeContents();
method @NonNull public android.telephony.LteVopsSupportInfo getLteVopsSupportInfo();
method public boolean isUsingCarrierAggregation();
method public void writeToParcel(android.os.Parcel, int);
field @NonNull public static final android.os.Parcelable.Creator<android.telephony.DataSpecificRegistrationInfo> CREATOR;
}
@@ -7775,6 +7776,7 @@ package android.telephony {
method @Nullable public android.telephony.CellIdentity getCellIdentity();
method @Nullable public android.telephony.DataSpecificRegistrationInfo getDataSpecificInfo();
method public int getDomain();
method public int getNrState();
method public int getRegistrationState();
method public int getRejectCause();
method public int getRoamingType();
@@ -8017,6 +8019,7 @@ package android.telephony {
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> getNetworkRegistrationInfoListForTransportType(int);
method public int getNrFrequencyRange();
method @Nullable public String getOperatorAlphaLongRaw();
method @Nullable public String getOperatorAlphaShortRaw();
field public static final int ROAMING_TYPE_DOMESTIC = 2; // 0x2

3
telephony/java/android/telephony/DataSpecificRegistrationInfo.java
View File

@@ -203,9 +203,12 @@ public final class DataSpecificRegistrationInfo implements Parcelable {
}
/**
* Get whether network has configured carrier aggregation or not.
*
* @return {@code true} if using carrier aggregation.
* @hide
*/
@SystemApi
public boolean isUsingCarrierAggregation() {
return mIsUsingCarrierAggregation;
}

3
telephony/java/android/telephony/NetworkRegistrationInfo.java
View File

@@ -323,9 +323,12 @@ public final class NetworkRegistrationInfo implements Parcelable {
public @Domain int getDomain() { return mDomain; }
/**
* Get the 5G NR connection state.
*
* @return the 5G NR connection state.
* @hide
*/
@SystemApi
public @NRState int getNrState() {
return mNrState;
}

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

@@ -1409,9 +1409,12 @@ public class ServiceState implements Parcelable {
}
/**
* Get the 5G NR frequency range the device is currently registered.
*
* @return the frequency range of 5G NR.
* @hide
*/
@SystemApi
public @FrequencyRange int getNrFrequencyRange() {
return mNrFrequencyRange;
}