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

Commit ffb09e11 authored by Jack Yu's avatar Jack Yu Committed by Gerrit Code Review
Browse files

Merge "Moved getId API from system to public"

parents 8b0cfd15 6a33ee19
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -40412,6 +40412,7 @@ package android.telephony {
  public final class PreciseDataConnectionState implements android.os.Parcelable {
    method public int describeContents();
    method @Nullable public android.telephony.data.ApnSetting getApnSetting();
    method public int getId();
    method public int getLastCauseCode();
    method @Nullable public android.net.LinkProperties getLinkProperties();
    method public int getNetworkType();
+0 −1
Original line number Diff line number Diff line
@@ -9795,7 +9795,6 @@ package android.telephony {
    method @Deprecated public int getDataConnectionApnTypeBitMask();
    method @Deprecated public int getDataConnectionFailCause();
    method @Deprecated public int getDataConnectionState();
    method public int getId();
  }
  public final class PreciseDisconnectCause {
+1 −3
Original line number Diff line number Diff line
@@ -166,14 +166,12 @@ public final class PreciseDataConnectionState implements Parcelable {
    /**
     * @return The unique id of the data connection
     *
     * Note this is the id assigned in {@link DataCallResponse}.
     * Note this is the id assigned by the data service.
     * The id remains the same for data connection handover between
     * {@link AccessNetworkConstants#TRANSPORT_TYPE_WLAN} and
     * {@link AccessNetworkConstants#TRANSPORT_TYPE_WWAN}
     *
     * @hide
     */
    @SystemApi
    public int getId() {
        return mId;
    }