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

Merge "Expose ServiceState#getDataNetworkType as SystemApi" am: 38fa60b511 am: 370a934081

Browse Source 
Change-Id: Ieb226d39bf3a8990c134a9e6e67f50e3c2135ed1
This commit is contained in:
Automerger Merge Worker
2020-01-15 19:22:15 +00:00
parent 88c4abb4ee 370a934081
commit e3faa5f0ab
3 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

@@ -8986,6 +8986,7 @@ package android.telephony {
public class ServiceState implements android.os.Parcelable {
method @NonNull public android.telephony.ServiceState createLocationInfoSanitizedCopy(boolean);
method public void fillInNotifierBundle(@NonNull android.os.Bundle);
method public int getDataNetworkType();
method public int getDataRegistrationState();
method @Nullable public android.telephony.NetworkRegistrationInfo getNetworkRegistrationInfo(int, int);
method @NonNull public java.util.List<android.telephony.NetworkRegistrationInfo> getNetworkRegistrationInfoList();

1
api/test-current.txt
View File

@@ -3018,6 +3018,7 @@ package android.telephony {
public class ServiceState implements android.os.Parcelable {
method public void addNetworkRegistrationInfo(android.telephony.NetworkRegistrationInfo);
method public int getDataNetworkType();
method public void setCdmaSystemAndNetworkId(int, int);
method public void setCellBandwidths(int[]);
method public void setChannelNumber(int);

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

@@ -1624,7 +1624,8 @@ public class ServiceState implements Parcelable {
* @return Current data network type
* @hide
*/
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
@SystemApi
@TestApi
public @NetworkType int getDataNetworkType() {
final NetworkRegistrationInfo iwlanRegInfo = getNetworkRegistrationInfo(
NetworkRegistrationInfo.DOMAIN_PS, AccessNetworkConstants.TRANSPORT_TYPE_WLAN);