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

Commit f6fdef09 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Automerger Merge Worker
Browse files

Merge "Move ParseException to Connectivity" am: cb35ed09 am: 75512d97 am: 7ef2e6d7 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iba0c91e109d04be28dca01c1997e74c06f12f60f
parents 096b9615 7ef2e6d7

core/api/current.txt

+0 −4
Original line number Original line Diff line number Diff line
@@ -26137,10 +26137,6 @@ package android.net { 
    ctor public NetworkSpecifier();

    ctor public NetworkSpecifier();

  }

  }

















  public class ParseException extends java.lang.RuntimeException {














    field public String response;














  }



























  public abstract class PlatformVpnProfile {







  public abstract class PlatformVpnProfile {











    method public final int getType();







    method public final int getType();











    method @NonNull public final String getTypeString();







    method @NonNull public final String getTypeString();

























packages/Connectivity/framework/api/current.txt



+4
−0




























Original line number
Original line
Diff line number
Diff line








@@ -401,6 +401,10 @@ package android.net {









    method public android.net.NetworkRequest.Builder setNetworkSpecifier(android.net.NetworkSpecifier);







    method public android.net.NetworkRequest.Builder setNetworkSpecifier(android.net.NetworkSpecifier);











  }







  }


































  public class ParseException extends java.lang.RuntimeException {














    field public String response;














  }


























  public class ProxyInfo implements android.os.Parcelable {







  public class ProxyInfo implements android.os.Parcelable {











    ctor public ProxyInfo(@Nullable android.net.ProxyInfo);







    ctor public ProxyInfo(@Nullable android.net.ProxyInfo);











    method public static android.net.ProxyInfo buildDirectProxy(String, int);







    method public static android.net.ProxyInfo buildDirectProxy(String, int);