Edwin Wong
60d80d4717
Merge "[RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability." into rvc-dev am: 8e96e47c73
am: 05d2bd5975
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13812193
Change-Id: I58240a530ebe9560b54fab47dd23474260965012
2021-04-06 22:23:06 +00:00
Edwin Wong
5cb6291b8c
[RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability. am: a4e76aab23
am: 6effd16a8b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13812193
Change-Id: I9f61c6d6a2ead1a76c0af77caee2c18f922c79e3
2021-04-06 22:23:03 +00:00
Edwin Wong
05d2bd5975
Merge "[RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability." into rvc-dev am: 8e96e47c73
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13812193
Change-Id: I7cef0f328ce49e592f0bed6f48900517810ce198
2021-04-06 21:49:17 +00:00
Edwin Wong
6effd16a8b
[RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability. am: a4e76aab23
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13812193
Change-Id: I59565fec934a5be32b5c5f32b6586965a7d9a932
2021-04-06 21:49:14 +00:00
Edwin Wong
8e96e47c73
Merge "[RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability." into rvc-dev
2021-04-06 21:06:40 +00:00
Treehugger Robot
dac506d64d
Merge "Adds new error code which is required by keystore to handle strongbox hal related functionality. Test: N/A Bug: b/184306647" am: 0ff57e62a8
am: 65e7f5e54e
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1663579
Change-Id: I7fe48071e375f65a411dbe8f613fd31e546bd05c
2021-04-06 17:36:25 +00:00
Treehugger Robot
65e7f5e54e
Merge "Adds new error code which is required by keystore to handle strongbox hal related functionality. Test: N/A Bug: b/184306647" am: 0ff57e62a8
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1663579
Change-Id: I4ed18bda76c765dec9ec527934f7599587605976
2021-04-06 17:01:25 +00:00
Treehugger Robot
0ff57e62a8
Merge "Adds new error code which is required by keystore to handle strongbox hal related functionality. Test: N/A Bug: b/184306647"
2021-04-06 15:59:30 +00:00
Edwin Wong
d39d06d99c
Merge "Fix potential decrypt destPtr overflow." into rvc-dev am: fc62c64de1
am: 2179627078
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13467452
Change-Id: I781f2833cc0c4c062f35097f8c2860fac4820eba
2021-04-05 22:37:14 +00:00
Michael Butler
9d0c3f1e77
Create NN AIDL Burst adapter am: 7a9d6092cd
am: 4e6d013362
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1663921
Change-Id: Icd28aea89f9911b207a266460eaeca116c6db719
2021-04-05 22:17:14 +00:00
Michael Butler
a4efef4f0e
Add additional parameters for NN Burst -- HAL am: 8414a6ebf9
am: b19c1cbef3
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1663920
Change-Id: Ie07a7e22e17154b31382ccde3178afa439cc42a0
2021-04-05 22:17:13 +00:00
Michael Butler
0f10ee9eb3
Add missing validation for NN canonical types am: 388bcebc8f
am: 2f59ea0610
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1663919
Change-Id: If56450f4660b43770d5ebea5a52f31aaacff6330
2021-04-05 22:17:11 +00:00
Edwin Wong
2179627078
Merge "Fix potential decrypt destPtr overflow." into rvc-dev am: fc62c64de1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13467452
Change-Id: If4aacd71d59955f315174047dda61e4dbd1e7e9a
2021-04-05 21:56:38 +00:00
Michael Butler
4e6d013362
Create NN AIDL Burst adapter am: 7a9d6092cd
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1663921
Change-Id: Icf672df81051c7a81857646f1f55dfe703030217
2021-04-05 21:36:08 +00:00
Michael Butler
b19c1cbef3
Add additional parameters for NN Burst -- HAL am: 8414a6ebf9
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1663920
Change-Id: If42779032ff2e6aa617c14a1f3e21379958eee05
2021-04-05 21:36:05 +00:00
Michael Butler
2f59ea0610
Add missing validation for NN canonical types am: 388bcebc8f
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1663919
Change-Id: Iab78bc898b2727be5000c9df2a4e52a1dd03345e
2021-04-05 21:35:29 +00:00
Edwin Wong
fc62c64de1
Merge "Fix potential decrypt destPtr overflow." into rvc-dev
2021-04-05 21:22:06 +00:00
Michael Butler
7a9d6092cd
Create NN AIDL Burst adapter
...
Bug: 180492058
Bug: 177267324
Test: mma
Test: NeuralNetworksTest_static
Change-Id: I2947faeb3820faa963e4df1eaf7aefec57b66c79
Merged-In: I2947faeb3820faa963e4df1eaf7aefec57b66c79
(cherry picked from commit 504f44926c
)
2021-04-02 22:03:12 -07:00
Michael Butler
8414a6ebf9
Add additional parameters for NN Burst -- HAL
...
Adds deadline and loopTimeoutDuration to nn::IBurst::execute.
This CL additionally adds a test case for
IPreparedModel::configureExecutionBurst and adds the suffix "_H" to
the header guards that were missing "_H".
Bug: 180492058
Bug: 177267324
Test: mma
Test: NeuralNetworksTest_static
Change-Id: Ic9ba2fb9b4dee4e40d99ae91bb9555a58d0508d2
Merged-In: Ic9ba2fb9b4dee4e40d99ae91bb9555a58d0508d2
(cherry picked from commit bbbdb0d5f1
)
2021-04-02 22:02:38 -07:00
Michael Butler
388bcebc8f
Add missing validation for NN canonical types
...
Bug: 177669661
Test: mma
Test: NeuralNetworksTest_static
Change-Id: Ic05c177f61a906a69bf82ff9c4d5bb8b0556d5ca
Merged-In: Ic05c177f61a906a69bf82ff9c4d5bb8b0556d5ca
(cherry picked from commit 08ee3f9287
)
2021-04-02 22:02:02 -07:00
Edwin Wong
a4e76aab23
[RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability.
...
The shared memory buffer used by srcPtr can be freed by another
thread because it is not protected by a mutex. Subsequently,
a use after free AIGABRT can occur in a race condition.
SafetyNet logging is not added to avoid log spamming. The
mutex lock is called to setup for decryption, which is
called frequently.
The crash was reproduced on the device before the fix.
Verified the test passes after the fix.
Test: sts
sts-tradefed run sts-engbuild-no-spl-lock -m StsHostTestCases --test android.security.sts.Bug_176495665#testPocBug_176495665
Test: push to device with target_hwasan-userdebug build
adb shell /data/local/tmp/Bug-176495665_sts64
Bug: 176495665
Bug: 176444161
Change-Id: I4c83c44873eef960b654f387a3574fcad49c41a9
2021-04-02 21:50:49 +00:00
Xusong Wang
cc57258fee
Rename BufferRole.frequency -> probability -- HAL. am: 3633d07092
am: 876c290465
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1663160
Change-Id: I723c1dad41d9e883a5fdca8ddb4586a0a4174b3e
2021-04-02 21:49:52 +00:00
Xusong Wang
876c290465
Rename BufferRole.frequency -> probability -- HAL. am: 3633d07092
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1663160
Change-Id: I136573a127b5cd81fd2f5bd022ca40feaad51638
2021-04-02 21:08:56 +00:00
Chirag Pathak
cfb9792b4c
Adds new error code which is required by keystore to handle strongbox hal related functionality.
...
Test: N/A
Bug: b/184306647
Change-Id: Ifbf7b931e58420f17e16f297205018248d39f476
2021-04-02 20:17:27 +00:00
Myles Watson
f8cfd25b39
Merge "VtsBluetooth: Use ASSERT_* to end the test ASAP" am: 21927e2ddd
am: a2a17c091f
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1662559
Change-Id: I54fe92a255db7e827e091a39456de51a61dd7bfe
2021-04-02 18:58:05 +00:00
Myles Watson
a2a17c091f
Merge "VtsBluetooth: Use ASSERT_* to end the test ASAP" am: 21927e2ddd
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1662559
Change-Id: Icf35c27fe317df9e44aedd92b060fb96564c9d5a
2021-04-02 18:21:07 +00:00
Xusong Wang
3633d07092
Rename BufferRole.frequency -> probability -- HAL.
...
"Frenquency" often refers to the number of occurrences over a period of
time, while "probability" refers to the number of occurrences of one
event over the number of occurrences of all events. "Probability" is a
better name for this field.
Fixes: 183117895
Test: VtsHalNeuralnetworksTargetTest
Test: NNT_static
Change-Id: Ic86f73b8be2aed567ae4ca17bdb3a57c658fb349
Merged-In: Ic86f73b8be2aed567ae4ca17bdb3a57c658fb349
(cherry picked from commit 46bf892f46
)
2021-04-02 10:26:29 -07:00
Myles Watson
21927e2ddd
Merge "VtsBluetooth: Use ASSERT_* to end the test ASAP"
2021-04-02 16:36:16 +00:00
Treehugger Robot
05d94afeba
Merge "Allow SecureClock tests to pass on devices w/out SecureClock" am: 1a9bbebbca
am: d7b3a20f25
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1662902
Change-Id: I21fc54e73f35c7ca573f69ef842cc50521337337
2021-04-02 16:10:33 +00:00
Shawn Willden
1b5bf4a339
Merge "Allow KeyMint tests to pass on devices w/out KeyMint" am: d7f1c1d638
am: 1da5562f93
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1662901
Change-Id: Iab23fbab7c1c37e7e50abe426d6cba02c163a35c
2021-04-02 16:10:29 +00:00
Shawn Willden
fa5c497e56
Merge "Correct error code in attest_key docs." am: b21b4a3663
am: 741884a363
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1662620
Change-Id: I728cc24ae0d0bb6deb26b8e1fd4008668a5bc30b
2021-04-02 16:10:19 +00:00
Treehugger Robot
d7b3a20f25
Merge "Allow SecureClock tests to pass on devices w/out SecureClock" am: 1a9bbebbca
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1662902
Change-Id: Ie4f4d2503d77764a0912cdcf39f872b387cb1534
2021-04-02 15:25:16 +00:00
Shawn Willden
1da5562f93
Merge "Allow KeyMint tests to pass on devices w/out KeyMint" am: d7f1c1d638
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1662901
Change-Id: I9ab8ff2be49db4e2946e74e6dfd7c196bd4687dd
2021-04-02 15:25:07 +00:00
Shawn Willden
741884a363
Merge "Correct error code in attest_key docs." am: b21b4a3663
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1662620
Change-Id: Ia0f1df2713a35026bcd89bd4fac72aead650146b
2021-04-02 15:24:26 +00:00
Treehugger Robot
1a9bbebbca
Merge "Allow SecureClock tests to pass on devices w/out SecureClock"
2021-04-02 14:51:49 +00:00
Shawn Willden
d7f1c1d638
Merge "Allow KeyMint tests to pass on devices w/out KeyMint"
2021-04-02 14:44:42 +00:00
Shawn Willden
b21b4a3663
Merge "Correct error code in attest_key docs."
2021-04-02 14:44:16 +00:00
Benjamin Schwartz
931e1e1dc0
power/stats: Index the state residency data providers am: 3bad122962
am: 82a8c67415
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1663119
Change-Id: Iff6ede9bcdd6b877b1b85b173a038d369a6a3429
2021-04-02 06:51:34 +00:00
Benjamin Schwartz
82a8c67415
power/stats: Index the state residency data providers am: 3bad122962
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1663119
Change-Id: Ie15a72e82306e08208f5c3ffc9d49599a8bb8884
2021-04-02 06:06:43 +00:00
Benjamin Schwartz
3bad122962
power/stats: Index the state residency data providers
...
Data providers that provided data for multiple entities were being added
to the data structure as nullptr due to move semantics. Now they will
only be added once (ensuring no more nullptr entries) and an index will
map each power entity id to its corresponding data provider.
Bug: 184290936
Test: Presubmit
Change-Id: I858269beb36ba5f87bb14a228079f3abd6c2332f
2021-04-01 18:26:38 -07:00
Steven Moreland
93c8494596
light: downgrade hardware open error am: 7af6d0fecc
am: 7c314eed3d
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1662759
Change-Id: Iaebc23fa1970cb5840484b01f172b8e4e6e423fb
2021-04-02 00:06:58 +00:00
Steven Moreland
7c314eed3d
light: downgrade hardware open error am: 7af6d0fecc
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1662759
Change-Id: I48c6332af23bfa1b83e5f84b43b3b858e50a482c
2021-04-01 23:20:41 +00:00
Shawn Willden
14fdd67a30
Allow SecureClock tests to pass on devices w/out SecureClock
...
Bug: 182289099
Test: VtsAidlSecureClockTargetTest
Change-Id: I830fe2879cd3328adf950060afb7e9eb18e558b7
2021-04-01 17:06:06 -06:00
Shawn Willden
7e71f1e5c5
Allow KeyMint tests to pass on devices w/out KeyMint
...
Bug: 181987225
Test: VtsAidlKeyMintTargetTest
Change-Id: I243fee463611ec2bf1f3661c46d3431280e187aa
2021-04-01 16:44:22 -06:00
Steven Moreland
7af6d0fecc
light: downgrade hardware open error
...
If a certain type of light isn't available, we want to indicate this,
but it isn't an error.
Bug: N/A (was asked to do this for some fixit)
Test: N/A
Change-Id: I69038964db22425a7e9b2c722ddd4f38bf5bea2e
2021-04-01 20:50:51 +00:00
Shawn Willden
7bbf6298f2
Correct error code in attest_key docs.
...
Also adds a test to verify that implementations return the expected
error code.
Test: VtsAidlKeyMintTargetTest
Change-Id: Ic8e9953a2572eb0cc8fefc363934eaf9b432b5a4
2021-04-01 12:57:21 -06:00
Myles Watson
244ad3663f
VtsBluetooth: Use ASSERT_* to end the test ASAP
...
Bug: 181133988
Change-Id: I19807685e0330196a4309e5c3d1183f37911bdd5
Test: atest VtsHalBluetoothV1_0TargetTest
Tag: #test-stability
2021-04-01 11:05:09 -07:00
Shawn Willden
d54b502de0
Merge "Fix documentation of EARLY_BOOT_ONLY tag in KeyMint" am: 49e5b5eacc
am: 3362fae7c3
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1650387
Change-Id: I33933ae734012262bfcb32a96be0c7f37b8f3813
2021-04-01 15:46:55 +00:00
Shawn Willden
3362fae7c3
Merge "Fix documentation of EARLY_BOOT_ONLY tag in KeyMint" am: 49e5b5eacc
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1650387
Change-Id: I2667024b9db2ab5a730d82daabba51580f464e19
2021-04-01 15:01:45 +00:00
Shawn Willden
49e5b5eacc
Merge "Fix documentation of EARLY_BOOT_ONLY tag in KeyMint"
2021-04-01 14:36:07 +00:00