RESTRICT AUTOMERGE: Fix Securty Test Annotations
Bug: 78358905
Test: build
Change-Id: Iea38d7c5b30f1a9fd0d18b61382faa838e7bc04b
diff --git a/tests/tests/security/src/android/security/cts/BigRleTest.java b/tests/tests/security/src/android/security/cts/BigRleTest.java
index f3c2302..bcfb1df 100644
--- a/tests/tests/security/src/android/security/cts/BigRleTest.java
+++ b/tests/tests/security/src/android/security/cts/BigRleTest.java
@@ -22,6 +22,7 @@
import java.io.InputStream;
+import android.platform.test.annotations.SecurityTest;
import android.security.cts.R;
public class BigRleTest extends AndroidTestCase {
@@ -31,6 +32,7 @@
* This image reports that its encoded length is over 4 gigs. Prior to fixing issue 33251605,
* we attempted to allocate space for all the encoded data at once, resulting in OOM.
*/
+ @SecurityTest(minPatchLevel = "2017-04")
public void test_android_bug_33251605() {
InputStream exploitImage = mContext.getResources().openRawResource(R.raw.bug_33251605);
Bitmap bitmap = BitmapFactory.decodeStream(exploitImage);
diff --git a/tests/tests/security/src/android/security/cts/OpenSSLEarlyCCSTest.java b/tests/tests/security/src/android/security/cts/OpenSSLEarlyCCSTest.java
index f8bf778..4bf0e76 100644
--- a/tests/tests/security/src/android/security/cts/OpenSSLEarlyCCSTest.java
+++ b/tests/tests/security/src/android/security/cts/OpenSSLEarlyCCSTest.java
@@ -109,7 +109,7 @@
* Tests that TLS handshake succeeds when the MiTM simply forwards all data without tampering
* with it. This is to catch issues unrelated to early CCS.
*/
- @SecurityTest
+ @SecurityTest(minPatchLevel = "2014-09")
public void testWithoutEarlyCCS() throws Exception {
handshake(false, false);
}
@@ -117,7 +117,7 @@
/**
* Tests whether client sockets are vulnerable to early CCS.
*/
- @SecurityTest
+ @SecurityTest(minPatchLevel = "2014-09")
public void testEarlyCCSInjectedIntoClient() throws Exception {
checkEarlyCCS(true);
}
@@ -125,7 +125,7 @@
/**
* Tests whether server sockets are vulnerable to early CCS.
*/
- @SecurityTest
+ @SecurityTest(minPatchLevel = "2014-09")
public void testEarlyCCSInjectedIntoServer() throws Exception {
checkEarlyCCS(false);
}
