summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorLorenzo Colitti <lorenzo@google.com>2017-08-20 11:54:57 +0900
committerLorenzo Colitti <lorenzo@google.com>2017-08-22 23:37:13 +0900
commit7a2b13ea6c640c2fb228c1fa11c9e5cd6c32c057 (patch)
treee4662b7649da642b0c7509608f50442693651660 /tools/aapt2/java/JavaClassGenerator.cpp
parentdd09e994f5d1a92a4a922dbc8742d0c15d9342d3 (diff)
Fix transitioning between non-accept strict policies.
https://android-review.googlesource.com/438278/ attempted to fix changing between two non-accept StrictMode policies (which is not supported by netd) by ensuring that if neither the old nor the new policy were accept, we'd first set an accept policy. Unfortunately, while this is what the comment says, what the code actually does is send the new policy twice. Fix the code to match the comment and the intent of the CL. While I'm at it, also move applyUidCleartextNetworkPolicy into the synchronized block, so multiple concurrent calls to setUidCleartextNetworkPolicy don't result in NMS state going out of sync with netd state. (cherry picked from commit 26364f1dea5f244f87d39615438266ef7eb3f28f) Bug: 28362720 Test: builds Change-Id: I7fe6871bda20566f4cc01ad75711ea52f9a72145
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions