OSDN Git Service

Disable the AppOp Restriction for IpSec Tunnels
authorNathan Harold <nharold@google.com>
Wed, 16 May 2018 02:18:38 +0000 (19:18 -0700)
committerNathan Harold <nharold@google.com>
Fri, 8 Jun 2018 23:23:04 +0000 (23:23 +0000)
commit65406494e75a73e38e01a63f0a2f4670bf0ba7be
treee4bf9be030bc4637a7976a5b491a711a5f2e2555
parent401c4b1d00d6f831eb30d1853683ca525d50f192
Disable the AppOp Restriction for IpSec Tunnels

This CL temporarily removes the AppOp restriction
that disallows creation of IpSec tunnels due to
the lack of the appropriate AppOp in AOSP/master.
When the relevant framework merges out to master,
this CL should be reverted.

Manually merging this due to skipping a merge
conflict at ef9f2740a790feceaa47a24b1a179e93c4ffb5e6

Bug: none
Test: compilation
Change-Id: Ic06c193f85f6bcdd0ead4238825c1add78703cde
services/core/java/com/android/server/IpSecService.java
tests/net/java/com/android/server/IpSecServiceParameterizedTest.java