Add CVE and scope to security test annotations. am: 12e5f19fc7

Original change: https://googleplex-android-review.googlesource.com/c/platform/platform_testing/+/13377523

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6e26097b209fbfbd05b06cfa2d3a83c75bde5c4e

2 files changed, 12 insertions, 0 deletions

diff --git a/libraries/annotations/src/android/platform/test/annotations/RootPermissionTest.java b/libraries/annotations/src/android/platform/test/annotations/RootPermissionTest.java
index 25496eff4..f520ef62e 100644
--- a/libraries/annotations/src/android/platform/test/annotations/RootPermissionTest.java
+++ b/libraries/annotations/src/android/platform/test/annotations/RootPermissionTest.java
@@ -34,4 +34,10 @@ public @interface RootPermissionTest {
     // TODO : Remove the default value. Need one in the interim whilst we undertake
     // the effort to annotate the existing tests with a corresponding patch-level.
     String minPatchLevel() default "";
+
+    // Denotes the CVE ID(s), comma-separated, to which this test applies.
+    String cve() default "";
+
+    // Denotes the scope (platform/kernel/vendor) to which this test applies.
+    String scope() default "";
 }
diff --git a/libraries/annotations/src/android/platform/test/annotations/SecurityTest.java b/libraries/annotations/src/android/platform/test/annotations/SecurityTest.java
index 56ae4b29f..1154c6fc5 100644
--- a/libraries/annotations/src/android/platform/test/annotations/SecurityTest.java
+++ b/libraries/annotations/src/android/platform/test/annotations/SecurityTest.java
@@ -33,4 +33,10 @@ public @interface SecurityTest {
     // TODO : Remove the default value. Need one in the interim whilst we undertake
     // the effort to annotate the existing tests with a corresponding patch-level.
     String minPatchLevel() default "";
+
+    // Denotes the CVE ID(s), comma-separated, to which this test applies.
+    String cve() default "";
+
+    // Denotes the scope (platform/kernel/vendor) to which this test applies.
+    String scope() default "";
 }