diff options
| -rw-r--r-- | common/networkstackclient/Android.bp | 2 | ||||
| -rw-r--r-- | tests/integration/src/android/net/ip/IpClientIntegrationTest.java | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/common/networkstackclient/Android.bp b/common/networkstackclient/Android.bp index 0ec3ce6..7c4b8d5 100644 --- a/common/networkstackclient/Android.bp +++ b/common/networkstackclient/Android.bp @@ -124,7 +124,7 @@ java_library { ], static_libs: [ "ipmemorystore-aidl-interfaces-V5-java", - "networkstack-aidl-interfaces-unstable-java", + "networkstack-aidl-interfaces-java", ], visibility: [ "//frameworks/base/packages/Tethering", diff --git a/tests/integration/src/android/net/ip/IpClientIntegrationTest.java b/tests/integration/src/android/net/ip/IpClientIntegrationTest.java index fc51065..a18d908 100644 --- a/tests/integration/src/android/net/ip/IpClientIntegrationTest.java +++ b/tests/integration/src/android/net/ip/IpClientIntegrationTest.java @@ -1533,6 +1533,13 @@ public class IpClientIntegrationTest { expectAlarmCancelled(inOrder, pref64Alarm); expectNat64PrefixUpdate(inOrder, null); + // Announce a non-/96 prefix and expect it to be ignored. + IpPrefix invalidPrefix = new IpPrefix("64:ff9b::/64"); + pref64 = new StructNdOptPref64(invalidPrefix, 1200).toByteBuffer(); + ra = buildRaPacket(pio, rdnss, pref64); + mPacketReader.sendResponse(ra); + expectNoNat64PrefixUpdate(inOrder, invalidPrefix); + // Re-announce the prefix. pref64 = new StructNdOptPref64(prefix, 600).toByteBuffer(); ra = buildRaPacket(pio, rdnss, pref64); |