commit 449c3b2cec7fbd0feac97aad4949c9fab1282069
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Oct 31 18:22:42 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 31 18:22:42 2023 +0000
tree f79b22d12600dd87b9950ab71d3754946215013d
parent ca3fa2b990709693dfe1bb7518020b8df9c2554a
parent 290dd7386fcf436e2bc0b4267054a921082a6d1f

Merge "Adding tests using APPLICATION_DATA and APPLICATION_ID." into main

keystore2/TEST_MAPPING

diff --git a/keystore2/TEST_MAPPING b/keystore2/TEST_MAPPING
index 5d0a7dd..f8a1302 100644
--- a/keystore2/TEST_MAPPING
+++ b/keystore2/TEST_MAPPING
@@ -30,6 +30,9 @@
   "postsubmit": [
     {
       "name": "CtsKeystorePerformanceTestCases"
+    },
+    {
+      "name": "keystore2_client_tests"
     }
   ]
 }

keystore2/aconfig/flags.aconfig

diff --git a/keystore2/aconfig/flags.aconfig b/keystore2/aconfig/flags.aconfig
index eb636bb..5d2a422 100644
--- a/keystore2/aconfig/flags.aconfig
+++ b/keystore2/aconfig/flags.aconfig
@@ -7,3 +7,11 @@
   bug: "191777960"
   is_fixed_read_only: true
 }
+
+flag {
+  name: "deprecate_legacy_keystore"
+  namespace: "hardware_backed_security"
+  description: "This flag rolls out legacy keystore deprecation and makes it so that the put command returns a deprecation error"
+  bug: "307460850"
+  is_fixed_read_only: true
+}

keystore2/tests/Android.bp

diff --git a/keystore2/tests/Android.bp b/keystore2/tests/Android.bp
index a574fa1..d33bf9f 100644
--- a/keystore2/tests/Android.bp
+++ b/keystore2/tests/Android.bp
@@ -30,6 +30,7 @@
     srcs: ["keystore2_client_tests.rs"],
     test_suites: [
         "general-tests",
+        "vts",
     ],
     test_config: "AndroidTest.xml",