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

Commit cc6d0a73 authored by Aaron Huang's avatar Aaron Huang Committed by Automerger Merge Worker
Browse files

Merge "API review: make exception class and Builder final" into rvc-dev am:... 

Merge "API review: make exception class and Builder final" into rvc-dev am: 9c9366b2 am: 59c7b6fa

Change-Id: I3cc16cac91d147795c717c7dd3c964c0edba1152
parents ac183f14 59c7b6fa

api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -6061,7 +6061,7 @@ package android.net { 
    method public void release();

  }













  public class InvalidPacketException extends java.lang.Exception {













  public final class InvalidPacketException extends java.lang.Exception {















    ctor public InvalidPacketException(int);















    method public int getError();















    field public static final int ERROR_INVALID_IP_ADDRESS = -21; // 0xffffffeb










@@ -6255,7 +6255,7 @@ package android.net {













    field public static final int NET_CAPABILITY_PARTIAL_CONNECTIVITY = 24; // 0x18















  }



























  public static class NetworkCapabilities.Builder {













  public static final class NetworkCapabilities.Builder {















    ctor public NetworkCapabilities.Builder();















    ctor public NetworkCapabilities.Builder(@NonNull android.net.NetworkCapabilities);















    method @NonNull public android.net.NetworkCapabilities.Builder addCapability(int);

































api/test-current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -1833,7 +1833,7 @@ package android.net {













    field public static final int TRANSPORT_TEST = 7; // 0x7















  }





























  public static class NetworkCapabilities.Builder {













  public static final class NetworkCapabilities.Builder {















    ctor public NetworkCapabilities.Builder();















    ctor public NetworkCapabilities.Builder(@NonNull android.net.NetworkCapabilities);















    method @NonNull public android.net.NetworkCapabilities.Builder addCapability(int);

































core/java/android/net/InvalidPacketException.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -27,7 +27,7 @@ import java.lang.annotation.RetentionPolicy;













 * @hide















 */















@SystemApi













public class InvalidPacketException extends Exception {













public final class InvalidPacketException extends Exception {















    private final int mError;































    // Must match SocketKeepalive#ERROR_INVALID_IP_ADDRESS.

































core/java/android/net/NetworkCapabilities.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -2000,7 +2000,7 @@ public final class NetworkCapabilities implements Parcelable {













     */















    @SystemApi















    @TestApi













    public static class Builder {













    public static final class Builder {















        private final NetworkCapabilities mCaps;































        /**