summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-02-25 04:04:44 +0000
committerLorenzo Colitti <lorenzo@google.com>2020-03-09 03:25:23 +0000
commit43c671da3e564ac4aff55df74ac9a7e3775de4a1 (patch)
treeee17f332db2a33c454b57c67c1620fd4d3fd2487 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent484d0e1a7ac05d7c665f8c7cde76a3e6993dce20 (diff)
Merge the following changes to tethering:
====== Fix a logic error in IpServerTest#addRemoveipv6ForwardingRules When checking that link-local and multicast neighbours are ignored, make sure the test neighbours are added on the correct interface. Otherwise, they might be ignored because events on the wrong interface are ignored, and not necessarily because link-local and multicast neighbours are ignored. Test: atest TetheringTests Change-Id: I4a624ea4ce9ee9a9352afccbc7bf866587d4cdfa ====== Clear IPv6 forwarding rules when losing upstream or stopping. Test: new unit test Change-Id: I8626932e43e0daa300dad5fe6a81f47a6d667030 ====== Bug: 149963652 Change-Id: I691053b22cb0b20e49419212f378cc473b1f35dc (cherry picked from commit 3384bb9a4d7bd85370fe64e59f2872a5cab644d7)
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions