Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 370a9340 authored by Hall Liu's avatar Hall Liu Committed by android-build-merger
Browse files

Merge "Expose ServiceState#getDataNetworkType as SystemApi" 

am: 38fa60b5

Change-Id: I3880263af615171a14600383540a673d8ec4e347
parents cd54c586 38fa60b5

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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();

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -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);

telephony/java/android/telephony/ServiceState.java

+2 −1
Original line number Diff line number Diff line
@@ -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);