diff options
| author | Chalard Jean <jchalard@google.com> | 2021-04-01 16:41:04 +0900 |
|---|---|---|
| committer | Chalard Jean <jchalard@google.com> | 2021-04-02 20:18:18 +0900 |
| commit | 6af8861d8e18204c3ed9976e6ecb4a6476c8a9c2 (patch) | |
| tree | 7a038cfbb1d4ac2353eb1b6c068b7f9b215a4874 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 36a84ebbaf2c955e1a191c1a9f1feaa97faa7014 (diff) | |
Fix broken testCaptivePortalApp
This was broken by aosp/1657763, only on eng builds because
of a wtf. The root cause of the issue is that the test is
acquiring MAINLINE_NETWORK_STACK after it registers a callback
but before in unregisters it. After aosp/1657763, the objects
keeping track of callbacks are separate for processes with and
without MAINLINE_NETWORK_STACK, which means the removal is
looked up in a different counter.
Solve this by having the NRI remember the relevant counter
keeping track of it.
Bug: none
Test: testCaptivePortalApp
Change-Id: I566a28522fa68be9cc2bdb4624b588b4f01d3b7e
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions