Edwin Wong
fa75337fa3
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability." into rvc-dev am: 8e96e47c73 am: ad95ed74bf -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13812193
Change-Id: Ib1d6fdafe3fa884e7120953637b7e793c380cd41
2021-04-06 22:27:02 +00:00
Edwin Wong
69a138feff
[automerger skipped] [RESTRICT AUTOMERGE] Fix CryptoPlugin use after free vulnerability. am: a4e76aab23 am: 0d561c4b13 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13812193
Change-Id: Id414dc129dc6857470c13af9a4c34c434473ac8c
2021-04-06 22:27:00 +00:00
Edwin Wong
ad95ed74bf
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: Ib71f3b54204743170ab9aa45a2566317df789fe8
2021-04-06 21:53:49 +00:00
Edwin Wong
0d561c4b13
[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: I9b33bb61f1c8b6ea3e7d71bdd7a299a16fc72f93
2021-04-06 21:53:48 +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
Michael Butler
e5aeed6a9f
Merge "Change NNAPI time from steady_clock to boot_clock -- hal" into sc-dev
2021-04-06 20:37:32 +00:00
Wei Wang
876960ac1c
Merge "power: bump default example implementation to version 2" into sc-dev
2021-04-06 18:32:15 +00:00
Treehugger Robot
dc1dfc75b5
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 am: dac506d64d
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1663579
Change-Id: Ifd646eab7624c9d1b465e5b5179d72286cb50211
2021-04-06 18:22:51 +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
Amy Zhang
2de5d78cf0
Merge "Refactor Tuner 1.0 vts to use dynamic configuration" into sc-dev
2021-04-06 17:24:50 +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
Edwin Wong
a95cd0fcd8
[automerger skipped] Merge "Fix potential decrypt destPtr overflow." into rvc-dev am: fc62c64de1 am: 2179627078 am: d39d06d99c -s ours
...
am skip reason: skip tag Change-Id I63043d10796f82ad805038ba1fad5bd7d5c89961 with SHA-1 9191787d0e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13467452
Change-Id: Ic1c45059d381edaf58781ab6b5b2b9afae04d4bf
2021-04-06 16:54:36 +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
c99bf00d21
Merge "Fix potential decrypt destPtr overflow." into rvc-dev am: fc62c64de1 am: b47d5de0da
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13467452
Change-Id: I5de5d9fd55c518b88c4eb7655bbd24e58c7c2f16
2021-04-06 05:07:07 +00:00
Wei Wang
7a7462397a
power: bump default example implementation to version 2
...
Bug: 177492680
Test: Build
Signed-off-by: Wei Wang <wvw@google.com >
Change-Id: If423a7d0fb800a9528336245c7dbf42689080f0b
2021-04-06 02:57:36 +00:00
Michael Butler
4895b4df79
Change NNAPI time from steady_clock to boot_clock -- hal
...
Previously, the NNAPI used std::chrono::steady_clock to represent and
measure timings. However, steady_clock does not count while the system
is suspended. Instead, boot_clock is monotonic like steady_clock but
does include the time when the system is suspended.
This change also indicates that services may convert from
std::chrono::steady_clock::time_point to
android::base::boot_clock::time_point in the HIDL 1.3 NN HAL.
Bug: 183118340
Test: mma
Test: VtsHalNeuralnetworksV1_3TargetTest
Test: VtsHalNeuralnetworksTargetTest
Test: presubmit
Change-Id: I5a7d039a31d9ce98602a301387ec99635f279f42
Merged-In: I5a7d039a31d9ce98602a301387ec99635f279f42
2021-04-06 00:01:38 +00:00
Michael Butler
42d9f3f3fb
Create NN AIDL Burst adapter am: 7a9d6092cd am: 4e6d013362 am: 9d0c3f1e77
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1663921
Change-Id: Ic509df7004b29a64bd1933750de0e2a7787dd972
2021-04-05 23:03:29 +00:00
Michael Butler
ae25708fa2
Add additional parameters for NN Burst -- HAL am: 8414a6ebf9 am: b19c1cbef3 am: a4efef4f0e
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1663920
Change-Id: Ic2baef0c456783024bca24cc6d53717934806653
2021-04-05 23:03:27 +00:00
Michael Butler
564f406016
Add missing validation for NN canonical types am: 388bcebc8f am: 2f59ea0610 am: 0f10ee9eb3
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1663919
Change-Id: I98a53bd66ff52ece26e06e1457592b726a3f9468
2021-04-05 23:03:24 +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
b47d5de0da
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: I3a540e3dfa4f95d5c5dd97bc1c4c70849ea08cff
2021-04-05 22:01:23 +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
Wei Wang
a98f551aad
Merge "ADPF: IPower: add aidl interfaces" into sc-dev
2021-04-05 20:50:41 +00:00
Edwin Wong
9cb545e6a0
Merge "Fix CryptoPlugin use after free vulnerability." into sc-dev
2021-04-05 20:47:48 +00:00
Kevin Chyn
46816afaf6
Update detectInteraction documentation
...
Bug: 182004420
Test: Builds
Change-Id: I1f785d4dda9bbde44aeab091b1f6cb1eaddf5afa
2021-04-05 11:22:07 -07:00
Wei Wang
050034128f
ADPF: IPower: add aidl interfaces
...
Test: Manual test, run bouncy ball
Test: atest VtsHalPowerTargetTest
Bug: 163794808
Change-Id: I295cf03b33ae8cb68826641c08a877a2a3e3a461
Signed-off-by: Wei Wang <wvw@google.com >
2021-04-05 22:19:03 +08: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
Xusong Wang
098b1e4e50
[automerger skipped] Rename BufferRole.frequency -> probability -- HAL. am: 3633d07092 am: 876c290465 am: cc57258fee -s ours
...
am skip reason: skip tag Change-Id Ic86f73b8be2aed567ae4ca17bdb3a57c658fb349 with SHA-1 46bf892f46 is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1663160
Change-Id: Icbab5e2c17c01ad7fa27838aa6d75e3bda0854d1
2021-04-02 22:36:54 +00: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
Yipeng Cao
51c85195c1
Fix gnss replay
...
Change the /dev/gnss0 read logic, will send the CMD_GET_LOCATION to
/dev/gnss0 first.
launch_cvd --start_gnss_proxy --gnss_file_path=xxx
Test: Manually
Bug: 183956668
Change-Id: Ic493790e80ceb6fd4d890b31e596b5c08addee40
(cherry picked from commit 80451ef0c3 )
2021-04-02 20:34:19 +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
91993f72ca
Merge "VtsBluetooth: Use ASSERT_* to end the test ASAP" am: 21927e2ddd am: a2a17c091f am: f8cfd25b39
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1662559
Change-Id: Ic46e14c04e0c1d04914ec81c9bb2064b0c5a6fb5
2021-04-02 19:30:37 +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
Treehugger Robot
632422424b
Merge "Allow SecureClock tests to pass on devices w/out SecureClock" am: 1a9bbebbca am: d7b3a20f25 am: 05d94afeba
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1662902
Change-Id: Iffaa3583109d2d67c2f98135d33646202cd107a7
2021-04-02 16:54:40 +00:00
Shawn Willden
e8589f0da9
Merge "Allow KeyMint tests to pass on devices w/out KeyMint" am: d7f1c1d638 am: 1da5562f93 am: 1b5bf4a339
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1662901
Change-Id: I0d714825903e326c96281abb303e82e4a12d901d
2021-04-02 16:54:36 +00:00
Shawn Willden
9271e2c06d
Merge "Correct error code in attest_key docs." am: b21b4a3663 am: 741884a363 am: fa5c497e56
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1662620
Change-Id: I45cfa78ffc22433e759e104f2ec92ca326e39001
2021-04-02 16:54:30 +00:00
Myles Watson
21927e2ddd
Merge "VtsBluetooth: Use ASSERT_* to end the test ASAP"
2021-04-02 16:36:16 +00:00