Commit Graph

32918 Commits

Author SHA1 Message Date
Xusong Wang
d2a1234f25 [automerger skipped] Fix use-after-free crash in VtsHalNeuralnetworksTargetTest. am: dee204e13f am: 6713a4f73f -s ours
am skip reason: Merged-In I00748aaaa1a3a3d9b3b62bedb77a655ddb6e210f with SHA-1 d2ecde5c54 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15694529

Change-Id: Ie7ce3db4496bab458415e378cbc8eafba945d480
2021-08-28 00:34:44 +00:00
Xusong Wang
6713a4f73f Fix use-after-free crash in VtsHalNeuralnetworksTargetTest. am: dee204e13f
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15694529

Change-Id: I569c04dde3fd34564dcfc5b34d50ecad69f6d614
2021-08-28 00:23:02 +00:00
Treehugger Robot
37b696597a Merge "Vts: thermal: Test notification with an unregistered local callback" am: 101c9db566 am: 80284f9153
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1811717

Change-Id: Id8b9e1b49ada73d5c9f8d658636ad09dfa58781c
2021-08-27 20:01:38 +00:00
Treehugger Robot
80284f9153 Merge "Vts: thermal: Test notification with an unregistered local callback" am: 101c9db566
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1811717

Change-Id: I9c1fcf82d12050d8a9d6151acde1d6ac0511ff1b
2021-08-27 19:49:48 +00:00
Treehugger Robot
101c9db566 Merge "Vts: thermal: Test notification with an unregistered local callback" 2021-08-27 19:34:25 +00:00
Treehugger Robot
d5062e475d Merge "Fix use-after-free crash in VtsHalNeuralnetworksTargetTest." am: 50a0c3ae3f am: f4263bff8f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1806243

Change-Id: I62cdbe2c0bc6e0333605dc0470e699e86248e2ff
2021-08-27 19:16:44 +00:00
Treehugger Robot
f4263bff8f Merge "Fix use-after-free crash in VtsHalNeuralnetworksTargetTest." am: 50a0c3ae3f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1806243

Change-Id: Ib67d8b80f076d3f8f8bf1a3e7eb038144ef77f89
2021-08-27 19:02:22 +00:00
Xusong Wang
dee204e13f Fix use-after-free crash in VtsHalNeuralnetworksTargetTest.
Prior to this CL, the AHardwareBuffer in TestBlobAHWB is released in the
destructor, but later used (unlock) during the destruction of the
mMapping member. This CL fixed this issue by managing the lifetime of
AHardwareBuffer with SharedMemory.

Bug: 197199690
Test: VtsHalNeuralnetworksTargetTest
Change-Id: I00748aaaa1a3a3d9b3b62bedb77a655ddb6e210f
Merged-In: I00748aaaa1a3a3d9b3b62bedb77a655ddb6e210f
(cherry picked from commit d2ecde5c54)
2021-08-27 11:51:24 -07:00
Treehugger Robot
50a0c3ae3f Merge "Fix use-after-free crash in VtsHalNeuralnetworksTargetTest." 2021-08-27 18:48:44 +00:00
Wei Wang
3ec02dc9a4 Vts: thermal: Test notification with an unregistered local callback
Bug: 197935704
Test: /data/nativetest64/VtsHalThermalV2_0TargetTest/VtsHalThermalV2_0TargetTest
Signed-off-by: Wei Wang <wvw@google.com>
Change-Id: Ida76565389d021b9433bfac8153408454f2bdee9
2021-08-27 11:27:07 -07:00
Treehugger Robot
8c85558acf [automerger skipped] Merge "Undefine NAN after including it in Looper.h" am: 02b3ca4e7c -s ours am: 2c960293f0 -s ours
am skip reason: Merged-In I63bba8ea809a12571ddc88cd1d20f2adeedf0b30 with SHA-1 2dd55590fd is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1799831

Change-Id: I3357dbd4aefa0e0cd19309ea7f67c65f9835ac79
2021-08-27 17:56:04 +00:00
Treehugger Robot
2c960293f0 [automerger skipped] Merge "Undefine NAN after including it in Looper.h" am: 02b3ca4e7c -s ours
am skip reason: Merged-In I63bba8ea809a12571ddc88cd1d20f2adeedf0b30 with SHA-1 2dd55590fd is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1799831

Change-Id: I858e2b22b6c38f250e4f216df984dbae9f77471a
2021-08-27 17:41:40 +00:00
Treehugger Robot
02b3ca4e7c Merge "Undefine NAN after including it in Looper.h" 2021-08-27 17:26:49 +00:00
Prabir Pradhan
e5f44158af [automerger skipped] Undefine NAN after including it in Looper.h am: 2dd55590fd -s ours
am skip reason: Merged-In I63bba8ea809a12571ddc88cd1d20f2adeedf0b30 with SHA-1 84a19f64f5 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15685265

Change-Id: I1203bae69897a66dffc80cf67d7c07288c66d0ba
2021-08-27 16:20:28 +00:00
Prabir Pradhan
2dd55590fd Undefine NAN after including it in Looper.h
Looper.h needs to include the header for unordered_map, which itself
includes math.h, which defines the macro NAN. Some HALs use enums called
NAN, which causes a build error if the NAN macro is defined. We need to
undef NAN in these cases after including Looper.h.

Bug: 195020232
Test: presubmit: checkbuild
Merged-In: I63bba8ea809a12571ddc88cd1d20f2adeedf0b30
Change-Id: I63bba8ea809a12571ddc88cd1d20f2adeedf0b30
(cherry picked from commit dda604440b)
(cherry picked from commit 84a19f64f5)
2021-08-27 11:04:36 +00:00
Yuchen He
c9160995ec Report default location when location is not available in /dev/gnss0
Test: atest VtsHalGnssTargetTest
Bug: 197579774
Bug: 197825053
Change-Id: I08e761d6023df2954d8a265b4af3e5b5d0aec09c
(cherry picked from commit 1aac7fa45c)
2021-08-26 16:42:05 +00:00
Michael Butler
1f68f0206a [automerger skipped] Quickly exit VtsHalNeuralnetworks*TargetTest on failure am: 8472d91b57 -s ours am: 269219cb69 -s ours
am skip reason: Merged-In I0b9a14345475e432b93f92c23010a8b39712443a with SHA-1 535f8c8098 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15675695

Change-Id: Id7cb986e43c8d892f36021eba0c552947847aeab
2021-08-25 23:02:34 +00:00
Michael Butler
269219cb69 [automerger skipped] Quickly exit VtsHalNeuralnetworks*TargetTest on failure am: 8472d91b57 -s ours
am skip reason: Merged-In I0b9a14345475e432b93f92c23010a8b39712443a with SHA-1 535f8c8098 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15675695

Change-Id: I4bdd18318a91ece554a0d806b005b72bcf87e470
2021-08-25 22:48:14 +00:00
Michael Butler
ba93e2b6d3 [automerger skipped] Merge "Quickly exit VtsHalNeuralnetworks*TargetTest on failure" into sc-dev am: 1fba40184d -s ours
am skip reason: Merged-In I0b9a14345475e432b93f92c23010a8b39712443a with SHA-1 ac45a5d77e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15676576

Change-Id: I29a1138768b851e92c6ffeb4fbd17f9416b5182d
2021-08-25 21:49:41 +00:00
Michael Butler
1fba40184d Merge "Quickly exit VtsHalNeuralnetworks*TargetTest on failure" into sc-dev 2021-08-25 21:33:56 +00:00
Steven Moreland
ec66b030d5 [automerger skipped] Merge "Remove ndk_platform backend. Use the ndk backend." am: 599ce892a5 -s ours am: 80087ce6c4 -s ours
am skip reason: Merged-In Ib58c9f1cb80d083a3c62d03415610be855b80f03 with SHA-1 d55d28a1d0 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1788175

Change-Id: I32611e9cbd4a9aa684befcaa64c2affcc886c3d7
2021-08-25 20:02:03 +00:00
Steven Moreland
80087ce6c4 [automerger skipped] Merge "Remove ndk_platform backend. Use the ndk backend." am: 599ce892a5 -s ours
am skip reason: Merged-In Ib58c9f1cb80d083a3c62d03415610be855b80f03 with SHA-1 d55d28a1d0 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1788175

Change-Id: Ifa62b72cad1c14fd8fb9711975d15c76758160d8
2021-08-25 19:45:21 +00:00
Steven Moreland
599ce892a5 Merge "Remove ndk_platform backend. Use the ndk backend." 2021-08-25 19:28:36 +00:00
Michael Butler
a7c8059078 Merge "Quickly exit VtsHalNeuralnetworks*TargetTest on failure" am: 0b2aee13af am: 89ba8b68e7
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1808356

Change-Id: I954014f94ad08ec09d3ce5a1fc3f57224d5bf5b1
2021-08-25 18:34:52 +00:00
Michael Butler
ab314957c1 [automerger skipped] Merge "Quick-fail NNAPI VTS test case if driver is dead" into sc-dev am: 35c0eee315 -s ours
am skip reason: Merged-In Ib1b75ed20f764055699590581d5ad4e5aff4baae with SHA-1 77c1b62362 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15667460

Change-Id: I2356b6777844e3eb0480eb55c0891e4fbc9ddfc3
2021-08-25 18:34:08 +00:00
Michael Butler
89ba8b68e7 Merge "Quickly exit VtsHalNeuralnetworks*TargetTest on failure" am: 0b2aee13af
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1808356

Change-Id: Id9bb8ec4a17efddc55253489180922345237b805
2021-08-25 18:16:37 +00:00
Michael Butler
35c0eee315 Merge "Quick-fail NNAPI VTS test case if driver is dead" into sc-dev 2021-08-25 18:15:40 +00:00
Michael Butler
535f8c8098 Quickly exit VtsHalNeuralnetworks*TargetTest on failure
This change adds the AndroidTest.xml flag --gtest_break_on_failure to
cause the gtest to terminate after an error has been reached. This early
termination is important in the case where an NN HAL service crashes
mid-test, and all remaining tests would otherwise continue to run.

Bug: 197035200
Test: m vts -j
Test: vts-tradefed
Change-Id: I0b9a14345475e432b93f92c23010a8b39712443a
Merged-In: I0b9a14345475e432b93f92c23010a8b39712443a
(cherry picked from commit ac45a5d77e)
2021-08-25 18:07:45 +00:00
Michael Butler
8472d91b57 Quickly exit VtsHalNeuralnetworks*TargetTest on failure
This change adds the AndroidTest.xml flag --gtest_break_on_failure to
cause the gtest to terminate after an error has been reached. This early
termination is important in the case where an NN HAL service crashes
mid-test, and all remaining tests would otherwise continue to run.

Bug: 197035200
Test: m vts -j
Test: vts-tradefed
Change-Id: I0b9a14345475e432b93f92c23010a8b39712443a
Merged-In: I0b9a14345475e432b93f92c23010a8b39712443a
(cherry picked from commit ac45a5d77e)
2021-08-25 18:07:20 +00:00
Michael Butler
0b2aee13af Merge "Quickly exit VtsHalNeuralnetworks*TargetTest on failure" 2021-08-25 18:02:13 +00:00
Android Build Prod User
a40db3343c Merge "Undefine NAN after including it in Looper.h" into sc-dev-plus-aosp 2021-08-25 15:15:47 +00:00
Michael Butler
ac45a5d77e Quickly exit VtsHalNeuralnetworks*TargetTest on failure
This change adds the AndroidTest.xml flag --gtest_break_on_failure to
cause the gtest to terminate after an error has been reached. This early
termination is important in the case where an NN HAL service crashes
mid-test, and all remaining tests would otherwise continue to run.

Bug: 197035200
Test: m vts -j
Test: vts-tradefed
Change-Id: I0b9a14345475e432b93f92c23010a8b39712443a
2021-08-24 23:44:57 -07:00
Treehugger Robot
22557982dd Merge "Fix CameraHidlTest" am: eb86f93f53 am: efba724466
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1771029

Change-Id: Iba379b60a2b3304f36dfb5086bc9e66a8804eee0
2021-08-25 00:56:29 +00:00
Treehugger Robot
efba724466 Merge "Fix CameraHidlTest" am: eb86f93f53
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1771029

Change-Id: Ie6c744bdd5cd3ffa36647fa1fbe4a985a89916e3
2021-08-25 00:38:56 +00:00
Treehugger Robot
eb86f93f53 Merge "Fix CameraHidlTest" 2021-08-25 00:22:52 +00:00
Michael Butler
191e66de52 [automerger skipped] Quick-fail NNAPI VTS test case if driver is dead am: 77c1b62362 am: 828b7259f5 -s ours
am skip reason: Merged-In Ib1b75ed20f764055699590581d5ad4e5aff4baae with SHA-1 9c3c8642fb is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15668776

Change-Id: I4fd512ba52c26a567d91f0800442fbb0a9ab16b7
2021-08-24 22:45:48 +00:00
Michael Butler
828b7259f5 Quick-fail NNAPI VTS test case if driver is dead am: 77c1b62362
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/15668776

Change-Id: I5e32fe0f824961db8d50e26ff32ff91a6407106b
2021-08-24 22:31:43 +00:00
Treehugger Robot
8295164f00 Merge "Add OWNERS for VTS module VtsHalGnssV1_0TargetTest" am: 8fe4685a13 am: 83677af000
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1793846

Change-Id: I319786c2b5daeab143bd1d6ffd309a455650a65f
2021-08-24 22:26:45 +00:00
Treehugger Robot
83677af000 Merge "Add OWNERS for VTS module VtsHalGnssV1_0TargetTest" am: 8fe4685a13
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1793846

Change-Id: Ie499a23ed4c4522fafb44e272f1abda232c4e55c
2021-08-24 22:01:52 +00:00
Treehugger Robot
8fe4685a13 Merge "Add OWNERS for VTS module VtsHalGnssV1_0TargetTest" 2021-08-24 21:48:19 +00:00
Michael Butler
77c1b62362 Quick-fail NNAPI VTS test case if driver is dead
This CL adds a check during SetUp that an NNAPI driver service is still
alive by pinging the driver service. If it is not alive, the test will
fail during SetUp. Without this quick-fail, the test case would continue
as if the driver were still active, which would result in multiple
EXPECT_* and ASSERT_* statements failing instead of a single, clear
failure message.

Bug: 197035200
Test: mma
Test: presubmit: VtsHalNeuralnetworks*TargetTest
Change-Id: Ib1b75ed20f764055699590581d5ad4e5aff4baae
Merged-In: Ib1b75ed20f764055699590581d5ad4e5aff4baae
(cherry picked from commit 9c3c8642fb)
2021-08-24 18:53:08 +00:00
Michael Butler
669dbab452 Quick-fail NNAPI VTS test case if driver is dead
This CL adds a check during SetUp that an NNAPI driver service is still
alive by pinging the driver service. If it is not alive, the test will
fail during SetUp. Without this quick-fail, the test case would continue
as if the driver were still active, which would result in multiple
EXPECT_* and ASSERT_* statements failing instead of a single, clear
failure message.

Bug: 197035200
Test: mma
Test: presubmit: VtsHalNeuralnetworks*TargetTest
Change-Id: Ib1b75ed20f764055699590581d5ad4e5aff4baae
Merged-In: Ib1b75ed20f764055699590581d5ad4e5aff4baae
(cherry picked from commit 9c3c8642fb)
2021-08-24 18:51:15 +00:00
Prabir Pradhan
84a19f64f5 Undefine NAN after including it in Looper.h
Looper.h needs to include the header for unordered_map, which itself
includes math.h, which defines the macro NAN. Some HALs use enums called
NAN, which causes a build error if the NAN macro is defined. We need to
undef NAN in these cases after including Looper.h.

Bug: 195020232
Test: presubmit: checkbuild
Merged-In: I63bba8ea809a12571ddc88cd1d20f2adeedf0b30
Change-Id: I63bba8ea809a12571ddc88cd1d20f2adeedf0b30
(cherry picked from commit dda604440b)
2021-08-24 18:40:56 +00:00
Michael Butler
87ac35e616 Merge "Quick-fail NNAPI VTS test case if driver is dead" am: 994a3856c9 am: 77c62d1131
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1806419

Change-Id: Id4aeb0e651dd315fb3e859c3b49177211b6065f0
2021-08-24 18:16:27 +00:00
Michael Butler
77c62d1131 Merge "Quick-fail NNAPI VTS test case if driver is dead" am: 994a3856c9
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1806419

Change-Id: Ia14cfc51ae570c7bcef90b765ec5ac15e7d8afe6
2021-08-24 18:04:46 +00:00
Michael Butler
994a3856c9 Merge "Quick-fail NNAPI VTS test case if driver is dead" 2021-08-24 17:44:45 +00:00
Michael Butler
9c3c8642fb Quick-fail NNAPI VTS test case if driver is dead
This CL adds a check during SetUp that an NNAPI driver service is still
alive by pinging the driver service. If it is not alive, the test will
fail during SetUp. Without this quick-fail, the test case would continue
as if the driver were still active, which would result in multiple
EXPECT_* and ASSERT_* statements failing instead of a single, clear
failure message.

Bug: 197035200
Test: mma
Test: presubmit: VtsHalNeuralnetworks*TargetTest
Change-Id: Ib1b75ed20f764055699590581d5ad4e5aff4baae
2021-08-23 18:27:49 -07:00
Xusong Wang
d2ecde5c54 Fix use-after-free crash in VtsHalNeuralnetworksTargetTest.
Prior to this CL, the AHardwareBuffer in TestBlobAHWB is released in the
destructor, but later used (unlock) during the destruction of the
mMapping member. This CL fixed this issue by managing the lifetime of
AHardwareBuffer with SharedMemory.

Bug: 197199690
Test: VtsHalNeuralnetworksTargetTest
Change-Id: I00748aaaa1a3a3d9b3b62bedb77a655ddb6e210f
2021-08-23 11:41:46 -07:00
Treehugger Robot
96dfe36dce Merge "Add OWNERS for VTS module VtsHalRadioConfigV1_0TargetTest" am: 7f23524b2c am: d418a199ac
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1783311

Change-Id: If9f232e5b8fdefd7e42f67c4d91cddb9a222d0d8
2021-08-23 17:54:42 +00:00
Treehugger Robot
d418a199ac Merge "Add OWNERS for VTS module VtsHalRadioConfigV1_0TargetTest" am: 7f23524b2c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1783311

Change-Id: Id2ad72b1ee38af410c88822983f42e27fe6b9edc
2021-08-23 17:42:25 +00:00