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

Commit 0d5ca163 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove replaced PreciseDataConnectionState methods from SDK." into... 

Merge "Remove replaced PreciseDataConnectionState methods from SDK." into rvc-dev am: da502403 am: 0480d926 am: 93636ae7 am: 73390c77

Change-Id: Idb832b50fc48d7c86ed344946610228bb1e61122
parents 0472e3b7 73390c77

api/system-current.txt

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

    method @Deprecated @NonNull public String getDataConnectionApn();

    method @Deprecated public int getDataConnectionApnTypeBitMask();

    method @Deprecated public int getDataConnectionApnTypeBitMask();

    method @Deprecated public int getDataConnectionFailCause();

    method @Deprecated public int getDataConnectionFailCause();

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

    method @Deprecated public int getDataConnectionNetworkType();

    method @Deprecated public int getDataConnectionState();

    method @Deprecated public int getDataConnectionState();

  }

  }































api/system-removed.txt



+5
−0




























Original line number
Original line
Diff line number
Diff line








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





























package android.telephony {







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 {







  public class TelephonyManager {











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







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











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







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

































telephony/api/system-current.txt



+0
−2




























Original line number
Original line
Diff line number
Diff line








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









    method @Deprecated @NonNull public String getDataConnectionApn();







    method @Deprecated @NonNull public String getDataConnectionApn();











    method @Deprecated public int getDataConnectionApnTypeBitMask();







    method @Deprecated public int getDataConnectionApnTypeBitMask();











    method @Deprecated public int getDataConnectionFailCause();







    method @Deprecated public int getDataConnectionFailCause();











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














    method @Deprecated public int getDataConnectionNetworkType();














    method @Deprecated public int getDataConnectionState();







    method @Deprecated public int getDataConnectionState();











  }







  }





















































telephony/api/system-removed.txt



+5
−0




























Original line number
Original line
Diff line number
Diff line











// Signature format: 2.0







// Signature format: 2.0











package android.telephony {







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 {







  public class TelephonyManager {











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







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











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







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

































telephony/java/android/telephony/PreciseDataConnectionState.java



+2
−0




























Original line number
Original line
Diff line number
Diff line








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









     *







     *











     * @deprecated use {@link getNetworkType()}







     * @deprecated use {@link getNetworkType()}











     * @hide







     * @hide














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











     */







     */











    @Deprecated







    @Deprecated











    @SystemApi







    @SystemApi










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









     *







     *











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







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











     * @hide







     * @hide














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











     */







     */











    @Deprecated







    @Deprecated











    @SystemApi







    @SystemApi