OSDN Git Service

Fix transitioning between non-accept strict policies.
authorLorenzo Colitti <lorenzo@google.com>
Sun, 20 Aug 2017 02:54:57 +0000 (11:54 +0900)
committerLorenzo Colitti <lorenzo@google.com>
Sun, 20 Aug 2017 03:16:29 +0000 (12:16 +0900)
commit26364f1dea5f244f87d39615438266ef7eb3f28f
treebe1f80b3b046bd7a8e8168eebe078ce312324f86
parentf1912ca49ac0f5bcdad063a7c042153ba791145d
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.

Bug: 28362720
Test: builds
Change-Id: I8d876ba0786c4d6325d26a84378fc6afcf47ab84
services/core/java/com/android/server/NetworkManagementService.java