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

Commit 30438ad6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove replaced PreciseDataConnectionState methods from SDK." into rvc-dev am: da502403 

Change-Id: Icc26b7446d88911ba40e5b0a3d888370af7d1c8e
parents aa0540d1 da502403

api/system-current.txt

+0 −2
Original line number Diff line number Diff line
@@ -10883,8 +10883,6 @@ package android.telephony { 
    method @Deprecated @NonNull public String getDataConnectionApn();

    method @Deprecated public int getDataConnectionApnTypeBitMask();

    method @Deprecated public int getDataConnectionFailCause();

    method @Deprecated @Nullable public android.net.LinkProperties getDataConnectionLinkProperties();

    method @Deprecated public int getDataConnectionNetworkType();

    method @Deprecated public int getDataConnectionState();

  }

























api/system-removed.txt



+5
−0




























Original line number
Diff line number
Diff line








@@ -180,6 +180,11 @@ package android.telecom {





























package android.telephony {





























  public final class PreciseDataConnectionState implements android.os.Parcelable {













    method @Deprecated @Nullable public android.net.LinkProperties getDataConnectionLinkProperties();













    method @Deprecated public int getDataConnectionNetworkType();













  }





























  public class TelephonyManager {















    method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void answerRingingCall();















    method @Deprecated @RequiresPermission(android.Manifest.permission.CALL_PHONE) public boolean endCall();

































telephony/api/system-current.txt



+0
−2




























Original line number
Diff line number
Diff line








@@ -394,8 +394,6 @@ package android.telephony {













    method @Deprecated @NonNull public String getDataConnectionApn();















    method @Deprecated public int getDataConnectionApnTypeBitMask();















    method @Deprecated public int getDataConnectionFailCause();













    method @Deprecated @Nullable public android.net.LinkProperties getDataConnectionLinkProperties();













    method @Deprecated public int getDataConnectionNetworkType();















    method @Deprecated public int getDataConnectionState();















  }

















































telephony/api/system-removed.txt



+5
−0




























Original line number
Diff line number
Diff line















// Signature format: 2.0















package android.telephony {





























  public final class PreciseDataConnectionState implements android.os.Parcelable {













    method @Deprecated @Nullable public android.net.LinkProperties getDataConnectionLinkProperties();













    method @Deprecated public int getDataConnectionNetworkType();













  }





























  public class TelephonyManager {















    method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void answerRingingCall();















    method @Deprecated @RequiresPermission(android.Manifest.permission.CALL_PHONE) public boolean endCall();

































telephony/java/android/telephony/PreciseDataConnectionState.java



+2
−0




























Original line number
Diff line number
Diff line








@@ -171,6 +171,7 @@ public final class PreciseDataConnectionState implements Parcelable {













     *















     * @deprecated use {@link getNetworkType()}















     * @hide













     * @removed Removed from the R preview SDK but was never part of the stable API surface.















     */















    @Deprecated















    @SystemApi










@@ -222,6 +223,7 @@ public final class PreciseDataConnectionState implements Parcelable {













     *















     * @deprecated use {@link #getLinkProperties()}















     * @hide













     * @removed Removed from the R preview SDK but was never part of the stable API surface.















     */















    @Deprecated















    @SystemApi