Merge "Disable the AppOp Restriction for IpSec Tunnels" into stage-aosp-master

am: bda7c96038 Change-Id: I98f2a964b3035daf93b54dc2b72561b16d2ded92
2018-06-09 09:25:32 -07:00
parent 98a949b0ee 1db89848ab
commit 1ea5d9ecbc
1 changed files with 2 additions and 0 deletions
--- a/tests/net/java/com/android/server/IpSecServiceParameterizedTest.java
+++ b/tests/net/java/com/android/server/IpSecServiceParameterizedTest.java
@@ -50,6 +50,7 @@ import java.util.Arrays;
 import java.util.Collection;

 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -592,6 +593,7 @@ public class IpSecServiceParameterizedTest {
        }
    }

+    @Ignore
    @Test
    public void testAddTunnelFailsForBadPackageName() throws Exception {
        try {