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

Commit f7a4c40e authored by Jack Yu's avatar Jack Yu Committed by Automerger Merge Worker
Browse files

Merge "Moved getId API from system to public" am: ffb09e11 am: afefc4e4 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640623

Change-Id: Ibb38cafd12c3ce68b7b75bef2af4565ba4ff6213
parents 131557b1 afefc4e4

core/api/current.txt

+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();

core/api/system-current.txt

+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 {

























telephony/java/android/telephony/PreciseDataConnectionState.java



+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;















    }