Merge "Re-hide ServiceState#getDataNetworkType" into rvc-dev

This commit is contained in:
Hall Liu
2020-03-17 01:11:43 +00:00
committed by Android (Google) Code Review
2 changed files with 0 additions and 2 deletions

View File

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

View File

@@ -1650,7 +1650,6 @@ public class ServiceState implements Parcelable {
* @return Current data network type
* @hide
*/
@SystemApi
@TestApi
public @NetworkType int getDataNetworkType() {
final NetworkRegistrationInfo iwlanRegInfo = getNetworkRegistrationInfo(