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

Commit 0054c04f authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "[Mainline] Add @hide. Revisit and redesign in S" into rvc-dev am:... 

Merge "[Mainline] Add @hide. Revisit and redesign in S" into rvc-dev am: 3269b7a4 am: 1e4a00e9 am: d7e45967 am: b6ebe872

Change-Id: I81793cd120ad985d2fb063291262f36ad4c72962
parents 4ae92455 b6ebe872

api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -11315,7 +11315,6 @@ package android.telephony { 
  public class ServiceState implements android.os.Parcelable {

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

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

telephony/java/android/telephony/ServiceState.java

+0 −1
Original line number Diff line number Diff line
@@ -580,7 +580,6 @@ public class ServiceState implements Parcelable { 
     *

     * @hide

     */

    @SystemApi

    public @RegState int getDataRegistrationState() {

        return getDataRegState();

    }