commit 999e9cfce68fceaf554b4dc6d76902c3fbbbdbf7
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Mar 28 04:39:41 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 28 04:39:41 2023 +0000
tree f00748e52019f6243cb237191100e7ecd0b49cb1
parent 4c306615dd20f7f2b3833a2781a85bea972aa24d
parent df791de79a3c72ae80b265608f53265be7f81597

Merge "[DO NOT MERGE] Add group 'uhid' to sensors multi-HAL." into tm-qpr-dev-plus-aosp

bluetooth/1.0/default/test/fuzzer/Android.bp

diff --git a/bluetooth/1.0/default/test/fuzzer/Android.bp b/bluetooth/1.0/default/test/fuzzer/Android.bp
index 691136f..de2b46d 100644
--- a/bluetooth/1.0/default/test/fuzzer/Android.bp
+++ b/bluetooth/1.0/default/test/fuzzer/Android.bp
@@ -60,5 +60,13 @@
             "android-media-fuzzing-reports@google.com",
         ],
         componentid: 533764,
+        hotlists: [
+            "4593311",
+        ],
+        description: "The fuzzer targets the APIs of android.hardware.bluetooth@1.0-impl library",
+        vector: "local_no_privileges_required",
+        service_privilege: "privileged",
+        users: "multi_user",
+        fuzzed_code_usage: "shipped",
     },
 }

identity/aidl/vts/Android.bp

diff --git a/identity/aidl/vts/Android.bp b/identity/aidl/vts/Android.bp
index 5e303bb..d8a5a87 100644
--- a/identity/aidl/vts/Android.bp
+++ b/identity/aidl/vts/Android.bp
@@ -66,7 +66,6 @@
     name: "IdentityCredentialImplementedTest",
     libs: [
         "tradefed",
-        "vts-core-tradefed-harness",
     ],
     srcs: ["src/**/*.java"],
     test_suites: [

secure_element/aidl/vts/VtsHalSecureElementTargetTest.cpp

diff --git a/secure_element/aidl/vts/VtsHalSecureElementTargetTest.cpp b/secure_element/aidl/vts/VtsHalSecureElementTargetTest.cpp
index 839a4ff..97b4e27 100644
--- a/secure_element/aidl/vts/VtsHalSecureElementTargetTest.cpp
+++ b/secure_element/aidl/vts/VtsHalSecureElementTargetTest.cpp
@@ -83,10 +83,15 @@
 
     void expectCallbackHistory(std::vector<bool>&& want) {
         std::unique_lock<std::mutex> l(m);
-        cv.wait_for(l, 2s, [&]() { return history.size() >= want.size(); });
+        cv.wait_for(l, 5s, [&]() { return history.size() >= want.size(); });
         EXPECT_THAT(history, ElementsAreArray(want));
     }
 
+    void resetCallbackHistory() {
+        std::unique_lock<std::mutex> l(m);
+        history.clear();
+    }
+
   private:
     std::mutex m;  // guards history
     std::condition_variable cv;
@@ -118,7 +123,9 @@
     }
 
     void TearDown() override {
+        secure_element_callback_->resetCallbackHistory();
         EXPECT_OK(secure_element_->reset());
+        secure_element_callback_->expectCallbackHistory({false, true});
         secure_element_ = nullptr;
         secure_element_callback_ = nullptr;
     }