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

Commit ac8d3772 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Re-hide ServiceState#getDataNetworkType" into rvc-dev am: 24ec6a7c am: 277659fa 

Change-Id: I8f36252adfaf5de4a1953aef9628310be0f4d7c3
parents a5a12027 277659fa

api/system-current.txt

+0 −1
Original line number Original line Diff line number Diff line
@@ -11257,7 +11257,6 @@ package android.telephony { 
















  public class ServiceState implements android.os.Parcelable {







  public class ServiceState implements android.os.Parcelable {











    method public void fillInNotifierBundle(@NonNull android.os.Bundle);







    method public void fillInNotifierBundle(@NonNull android.os.Bundle);











    method public int getDataNetworkType();














    method @Nullable public android.telephony.NetworkRegistrationInfo getNetworkRegistrationInfo(int, int);







    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> getNetworkRegistrationInfoListForDomain(int);











    method @NonNull public java.util.List<android.telephony.NetworkRegistrationInfo> getNetworkRegistrationInfoListForTransportType(int);







    method @NonNull public java.util.List<android.telephony.NetworkRegistrationInfo> getNetworkRegistrationInfoListForTransportType(int);

























telephony/java/android/telephony/ServiceState.java



+0
−1




























Original line number
Original line
Diff line number
Diff line








@@ -1650,7 +1650,6 @@ public class ServiceState implements Parcelable {









     * @return Current data network type







     * @return Current data network type











     * @hide







     * @hide











     */







     */











    @SystemApi














    @TestApi







    @TestApi











    public @NetworkType int getDataNetworkType() {







    public @NetworkType int getDataNetworkType() {











        final NetworkRegistrationInfo iwlanRegInfo = getNetworkRegistrationInfo(







        final NetworkRegistrationInfo iwlanRegInfo = getNetworkRegistrationInfo(