| commit | 2140d5140bcf8c5563bbb5d532e2e7f3ca6a2b3d | [log] [tgz] |
|---|---|---|
| author | Xiao Ma <xiaom@google.com> | Tue Mar 09 02:37:32 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 09 02:37:32 2021 +0000 |
| tree | b7ff6cbf16bc4ad8e7e2344c776da170e7a851e7 | |
| parent | 1ef098c32462f161d7974d92c065db7d51c07a15 [diff] | |
| parent | a7c245d1ceda885fddda7baa65355e3b974a02d7 [diff] |
Merge "Add bit mask constants for the flags used in the ND packet." am: 98e9e80694 am: 41629888ac Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1619359 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iea0ba50e4fbf4cd9dfd9068fd477ea820cff3b11
diff --git a/staticlibs/framework/com/android/net/module/util/NetworkStackConstants.java b/staticlibs/framework/com/android/net/module/util/NetworkStackConstants.java index 5f62186..499297c 100644 --- a/staticlibs/framework/com/android/net/module/util/NetworkStackConstants.java +++ b/staticlibs/framework/com/android/net/module/util/NetworkStackConstants.java
@@ -148,9 +148,18 @@ public static final int ICMPV6_ND_OPTION_RDNSS = 25; public static final int ICMPV6_ND_OPTION_PREF64 = 38; - public static final int ICMPV6_RA_HEADER_LEN = 16; + public static final int NEIGHBOR_ADVERTISEMENT_FLAG_ROUTER = 1 << 31; + public static final int NEIGHBOR_ADVERTISEMENT_FLAG_SOLICITED = 1 << 30; + public static final int NEIGHBOR_ADVERTISEMENT_FLAG_OVERRIDE = 1 << 29; + + public static final byte ROUTER_ADVERTISEMENT_FLAG_MANAGED_ADDRESS = (byte) (1 << 7); + public static final byte ROUTER_ADVERTISEMENT_FLAG_OTHER = (byte) (1 << 6); + + public static final byte PIO_FLAG_ON_LINK = (byte) (1 << 7); + public static final byte PIO_FLAG_AUTONOMOUS = (byte) (1 << 6); + /** * UDP constants. *