Merge changes I3e663483,I7fdc7038 into oreo-mr1-cts-dev

* changes:
  Removing Kernel Settings Test from STS
  Service Permissions Tests should not be a part of STS

2 files changed, 0 insertions, 4 deletions

diff --git a/tests/tests/security/src/android/security/cts/KernelSettingsTest.java b/tests/tests/security/src/android/security/cts/KernelSettingsTest.java
index ca68c7825e6..49873f64ed2 100644
--- a/tests/tests/security/src/android/security/cts/KernelSettingsTest.java
+++ b/tests/tests/security/src/android/security/cts/KernelSettingsTest.java
@@ -16,7 +16,6 @@
 
 package android.security.cts;
 
-import android.platform.test.annotations.SecurityTest;
 
 import junit.framework.TestCase;
 
@@ -30,7 +29,6 @@ import java.io.IOException;
  * Verify that the kernel is configured how we expect it to be
  * configured.
  */
-@SecurityTest
 public class KernelSettingsTest extends TestCase {
 
     static {
diff --git a/tests/tests/security/src/android/security/cts/ServicePermissionsTest.java b/tests/tests/security/src/android/security/cts/ServicePermissionsTest.java
index bfe1f55e375..fdc305830eb 100644
--- a/tests/tests/security/src/android/security/cts/ServicePermissionsTest.java
+++ b/tests/tests/security/src/android/security/cts/ServicePermissionsTest.java
@@ -19,7 +19,6 @@ package android.security.cts;
 import android.os.IBinder;
 import android.os.DeadObjectException;
 import android.os.TransactionTooLargeException;
-import android.platform.test.annotations.SecurityTest;
 import android.test.AndroidTestCase;
 import android.util.Log;
 
@@ -34,7 +33,6 @@ import java.util.ArrayList;
 /**
  * Verifies that permissions are enforced on various system services.
  */
-@SecurityTest
 public class ServicePermissionsTest extends AndroidTestCase {
 
     private static final String TAG = "ServicePermissionsTest";