commit 9da4ca1a335e40dc4614310f471c49c7ffe6f8ea
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue May 10 07:15:44 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue May 10 07:15:44 2022 +0000
tree 1958a3c973ff573627f525a97934638eb9509fba
parent 84c41a1c3838f3be03cfc7785c930659fbf3c082
parent 53c5598b99c6d4733d5e83fa6c4a70b03d6e182a

Snap for 8564071 from 53c5598b99c6d4733d5e83fa6c4a70b03d6e182a to mainline-wifi-release

Change-Id: I40ceace2ec3bc75d5c1234474c73261ae6b6eaa5

tests/TEST_MAPPING

diff --git a/tests/TEST_MAPPING b/tests/TEST_MAPPING
index fb3b813..5bdb1d3 100644
--- a/tests/TEST_MAPPING
+++ b/tests/TEST_MAPPING
@@ -3,5 +3,10 @@
     {
       "name": "dmabufheap-unit-tests"
     }
+  ],
+  "hwasan-postsubmit": [
+    {
+      "name": "dmabufheap-unit-tests"
+    }
   ]
 }

tests/dmabuf_heap_test.cpp

diff --git a/tests/dmabuf_heap_test.cpp b/tests/dmabuf_heap_test.cpp
index c88cf14..d9b00be 100644
--- a/tests/dmabuf_heap_test.cpp
+++ b/tests/dmabuf_heap_test.cpp
@@ -285,7 +285,7 @@
 TEST_F(DmaBufHeapTest, TestDmabufSystemHeapCompliance) {
     using android::vintf::KernelVersion;
 
-    if (android::base::GetIntProperty("ro.product.first_api_level", 0) < __ANDROID_API_S__) {
+    if (android::base::GetIntProperty("ro.vendor.api_level", 0) < __ANDROID_API_S__) {
         GTEST_SKIP();
     }