Commit graph

38523 commits

Author SHA1 Message Date
Ram Indani
8a2c44fa6c Merge "AIDL vts non reader writer 2.1 tests" 2021-12-02 16:48:55 +00:00
Ram Indani
1be07e8a84 Merge "AIDL vts 2.1 test differences in the existing tests." 2021-12-02 16:48:35 +00:00
David Drysdale
99f0d25bd9 Merge "Use defaults to reference current keymint version" am: ddf63247e9 am: 2fedeb5718 am: 5a903ea23a am: 8b035f0e23
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1898852

Change-Id: Id00ef73ec28418c4a2f859919c6eac3845748941
2021-12-02 10:51:40 +00:00
David Drysdale
8b035f0e23 Merge "Use defaults to reference current keymint version" am: ddf63247e9 am: 2fedeb5718 am: 5a903ea23a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1898852

Change-Id: I30440a13b7696158b05c9ff613f3aa0186586c49
2021-12-02 09:03:45 +00:00
David Drysdale
5a903ea23a Merge "Use defaults to reference current keymint version" am: ddf63247e9 am: 2fedeb5718
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1898852

Change-Id: I22d66b49e2e99bae00d54feb1a59696014bb5110
2021-12-02 08:33:48 +00:00
David Drysdale
2fedeb5718 Merge "Use defaults to reference current keymint version" am: ddf63247e9
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1898852

Change-Id: I8cec83ec6c73c7fbaba8c2340c56aee50addce7c
2021-12-02 08:09:33 +00:00
David Drysdale
ddf63247e9 Merge "Use defaults to reference current keymint version" 2021-12-02 07:55:03 +00:00
Sarah Chin
5d29ada486 Merge "Add new fields to DataProfile" 2021-12-02 05:40:42 +00:00
Tomasz Wasilczyk
b32012d73f Merge "Match Wi-Fi HAL native code style with rest of HALs." 2021-12-01 22:07:09 +00:00
TreeHugger Robot
01649e0b4d Merge "Beef up the documentation of VehicleApPowerStateReq" 2021-12-01 20:33:12 +00:00
Tomasz Wasilczyk
5f9639673b Match Wi-Fi HAL native code style with rest of HALs.
Bug: 201467304
Test: N/A
Change-Id: Iba03628fa19598c9f4c7f2bf1156ebe69a46c270
2021-12-01 10:11:14 -08:00
Treehugger Robot
325960671f Merge "KeyMint: Test invalid AES key sizes" am: bb0ab83af8 am: 7770509519 am: 9087d75542 am: 14a6f9e8b5
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1893476

Change-Id: If84895969168bb49f1f5a22d252bfcd31a84be58
2021-12-01 15:06:40 +00:00
Treehugger Robot
14a6f9e8b5 Merge "KeyMint: Test invalid AES key sizes" am: bb0ab83af8 am: 7770509519 am: 9087d75542
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1893476

Change-Id: I17f6c1936b91df5635854989fddf79c2cd9a5faa
2021-12-01 14:37:15 +00:00
Treehugger Robot
9087d75542 Merge "KeyMint: Test invalid AES key sizes" am: bb0ab83af8 am: 7770509519
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1893476

Change-Id: I961b8dcb28198b8d433b9b274b6a38019fbd7047
2021-12-01 14:19:47 +00:00
Treehugger Robot
7770509519 Merge "KeyMint: Test invalid AES key sizes" am: bb0ab83af8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1893476

Change-Id: Ief97104f2037e999d36ad6cd68a339caa1e402a0
2021-12-01 14:07:38 +00:00
Treehugger Robot
bb0ab83af8 Merge "KeyMint: Test invalid AES key sizes" 2021-12-01 13:48:57 +00:00
Kedar Chitnis
a00b444f5d Merge "dumpstate: Add dumpstate device AIDL HAL" am: 745a344a7c am: e8222cb95a am: 40ae004029 am: 3d3108cdc0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1895055

Change-Id: I06a0a1762b1e4b7303f1f54cc4aae7912cd226f3
2021-12-01 13:12:58 +00:00
Kedar Chitnis
3d3108cdc0 Merge "dumpstate: Add dumpstate device AIDL HAL" am: 745a344a7c am: e8222cb95a am: 40ae004029
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1895055

Change-Id: I86efbb4f88f531b03a037d687ee8cd98cba5fc68
2021-12-01 12:59:46 +00:00
Kedar Chitnis
40ae004029 Merge "dumpstate: Add dumpstate device AIDL HAL" am: 745a344a7c am: e8222cb95a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1895055

Change-Id: Ic5b3e864f4fab3fd53abd571eb1930f2adf8381f
2021-12-01 12:43:03 +00:00
Kedar Chitnis
e8222cb95a Merge "dumpstate: Add dumpstate device AIDL HAL" am: 745a344a7c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1895055

Change-Id: I2850f1eca597c0f9800f7e84ad749e8b878420b5
2021-12-01 12:30:31 +00:00
Kedar Chitnis
745a344a7c Merge "dumpstate: Add dumpstate device AIDL HAL" 2021-12-01 12:16:33 +00:00
Treehugger Robot
cefc38f199 Merge "health: properly support charger mode." am: 21c1e163d4 am: d9964bb31a am: 233a367c14 am: d6f310a7c5
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1894881

Change-Id: Idd1f86c608e0023619ffd26ca85593d511c47c40
2021-12-01 04:42:36 +00:00
Treehugger Robot
d6f310a7c5 Merge "health: properly support charger mode." am: 21c1e163d4 am: d9964bb31a am: 233a367c14
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1894881

Change-Id: I7da501b2913d93d293f9a4ac83cf04dfb0bb47e3
2021-12-01 04:28:09 +00:00
Treehugger Robot
233a367c14 Merge "health: properly support charger mode." am: 21c1e163d4 am: d9964bb31a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1894881

Change-Id: I07f1661448c9229e4c2d906abc4903d481ccc940
2021-12-01 04:18:19 +00:00
Treehugger Robot
d9964bb31a Merge "health: properly support charger mode." am: 21c1e163d4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1894881

Change-Id: I3d7d0071a74e49c1312cf8c959972905941b047f
2021-12-01 04:01:37 +00:00
Treehugger Robot
21c1e163d4 Merge "health: properly support charger mode." 2021-12-01 03:45:49 +00:00
ramindani
2740baca70 AIDL vts non reader writer 2.1 tests
Test: atest VtsHalGraphicsComposer3_TargetTest
BUG: 199413815
Change-Id: Ib801b248c83111fafc2c239e1edecd859067c62e
2021-12-01 00:38:23 +00:00
ramindani
770d70876a AIDL vts 2.1 test differences in the existing tests.
Test: atest VtsHalGraphicsComposer3_TargetTest
BUG: 199413815
Change-Id: I4b3c6eadea9d17eabb9c06d098b654cd4d93267b
2021-11-30 21:50:01 +00:00
David Drysdale
8590b861e6 [automerger skipped] Merge "KeyMint VTS: don't combine ATTEST_KEY with SIGN" into sc-v2-dev am: 46d62b92fb -s ours am: b017ca4ae8 -s ours
am skip reason: Merged-In Ib6e4ad98cbe5c3015138854679b11fa0e683ade9 with SHA-1 b3b121493d is already in history

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

Change-Id: I52192784a990c92e773bb001171cdb0de47b2b08
2021-11-30 10:05:19 +00:00
David Drysdale
275f791e12 Merge changes from topic "merge-unique-id-tests" into sc-v2-dev am: 92ffdd5b27 am: 6cad1ea6eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/16230166

Change-Id: If6a39ceaad9117f765ede953b75118e0e002d432
2021-11-30 10:04:57 +00:00
David Drysdale
80d4173fa3 [automerger skipped] KeyMint VTS: check INCLUDE_UNIQUE_ID works am: 2f361c1571 -s ours am: aea20f2cc3 -s ours
am skip reason: Merged-In I8bc674b47549aa1133f816c510289774db752e04 with SHA-1 565ccc70ed is already in history

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

Change-Id: Ib864e23a4cf1fa42fb2bbfd84cfc1271996c064b
2021-11-30 10:04:55 +00:00
David Drysdale
b017ca4ae8 [automerger skipped] Merge "KeyMint VTS: don't combine ATTEST_KEY with SIGN" into sc-v2-dev am: 46d62b92fb -s ours
am skip reason: Merged-In Ib6e4ad98cbe5c3015138854679b11fa0e683ade9 with SHA-1 b3b121493d is already in history

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

Change-Id: I502b25e94a94e3d75cdca51e081e4fd059b3dedb
2021-11-30 09:47:39 +00:00
David Drysdale
6cad1ea6eb Merge changes from topic "merge-unique-id-tests" into sc-v2-dev am: 92ffdd5b27
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/16230166

Change-Id: I78a375d7a3b959d90e5bbec400590e696a09609c
2021-11-30 09:47:31 +00:00
David Drysdale
aea20f2cc3 [automerger skipped] KeyMint VTS: check INCLUDE_UNIQUE_ID works am: 2f361c1571 -s ours
am skip reason: Merged-In I8bc674b47549aa1133f816c510289774db752e04 with SHA-1 565ccc70ed is already in history

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

Change-Id: I553ad8303c55f975ab354988e07ac2b837fdff14
2021-11-30 09:47:28 +00:00
David Drysdale
46d62b92fb Merge "KeyMint VTS: don't combine ATTEST_KEY with SIGN" into sc-v2-dev 2021-11-30 09:30:01 +00:00
David Drysdale
92ffdd5b27 Merge changes from topic "merge-unique-id-tests" into sc-v2-dev
* changes:
  KeyMint VTS: extra unique ID test
  KeyMint VTS: check INCLUDE_UNIQUE_ID works
2021-11-30 09:29:22 +00:00
David Drysdale
f60d8c4535 Merge "Fix flaky corrupted padding tests" am: a33f46bc2a am: 61cf943208 am: 02951d1167 am: d1c5ed5bec
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1903312

Change-Id: I803c4549b635d900934403c775886b1153b91a12
2021-11-30 07:41:54 +00:00
David Drysdale
d1c5ed5bec Merge "Fix flaky corrupted padding tests" am: a33f46bc2a am: 61cf943208 am: 02951d1167
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1903312

Change-Id: Ie50a00970832fc03691a66907534ccc0fc71208f
2021-11-30 07:28:03 +00:00
David Drysdale
02951d1167 Merge "Fix flaky corrupted padding tests" am: a33f46bc2a am: 61cf943208
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1903312

Change-Id: Ia38b396861bbe402e726f8dec4f589520a01b90a
2021-11-30 07:17:13 +00:00
David Drysdale
61cf943208 Merge "Fix flaky corrupted padding tests" am: a33f46bc2a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1903312

Change-Id: I5e5b1e62c017e2e1db8ce099e1cabda6501ce44c
2021-11-30 07:00:16 +00:00
David Drysdale
a33f46bc2a Merge "Fix flaky corrupted padding tests" 2021-11-30 06:44:30 +00:00
Treehugger Robot
c70f0dcfbb Merge "health storage AIDL HAL logs more." am: 4b0c7f0e7a am: 94dea4096c am: 9bc26cbcb8 am: 76db9d7ba6
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1905374

Change-Id: I5922550be0e1ad99459bfdcd9ff0e1446baf071c
2021-11-30 00:46:39 +00:00
Treehugger Robot
76db9d7ba6 Merge "health storage AIDL HAL logs more." am: 4b0c7f0e7a am: 94dea4096c am: 9bc26cbcb8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1905374

Change-Id: I510c018641993fc6b8bfa6a6a03af60d361978e9
2021-11-30 00:21:44 +00:00
Treehugger Robot
9bc26cbcb8 Merge "health storage AIDL HAL logs more." am: 4b0c7f0e7a am: 94dea4096c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1905374

Change-Id: Ifd3949da1e1a80c1437e36eaed024f466c0ab8d5
2021-11-30 00:10:33 +00:00
Treehugger Robot
94dea4096c Merge "health storage AIDL HAL logs more." am: 4b0c7f0e7a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1905374

Change-Id: Ifc15c002af051dfae4b0b8b3efcdd79ecb1011ed
2021-11-29 23:52:45 +00:00
Treehugger Robot
4b0c7f0e7a Merge "health storage AIDL HAL logs more." 2021-11-29 23:33:55 +00:00
Yifan Hong
9f1639f6b4 health storage AIDL HAL logs more.
Test: builds
Bug: 206775954
Change-Id: I211e29e495a974e9c93ac97c7dd9ef93e1bcb5ef
2021-11-29 22:03:15 +00:00
Patrick Rohr
3f72612578 Merge changes I9fb4e87e,Id018c33c,I5b6bdb3b
* changes:
  fix tuner filter callback scheduler
  fix filter event creation
  fix mFilterEvents locking
2021-11-29 21:44:50 +00:00
Patrick Rohr
892366fe60 fix tuner filter callback scheduler
This fixes multiple issues in filter callback scheduler:
- currently, when mDataSizeDelayInBytes is 0, filter events are sent
every time onFilterEvent is called. When mTimeDelayInMs is set (to
something else than 0), this will falsely override the time delay.
- when datasize delay or time delays are updated, the cv needs to be
notified so the new delay goes into effect right away.
- std::condition_variables *must* make use of a shared variable in order
to prevent lost and spurious wakeups.

Test: atest VtsHalTvTunerTargetTest
Bug: 183057734
Change-Id: I9fb4e87e8ba887f0ce891ccb9981bfa49a3ceada
2021-11-29 19:02:12 +01:00
Patrick Rohr
0b85b97213 fix filter event creation
Change I154eb05bc419f827008161f85a6304a8599dc399 was incomplete and
caused some filter events to not be produced anymore. This change fixes
that issue and moves to a cleaner (and clearer!) way of creating filter events.
Note: Change I154eb05bc419f827008161f85a6304a8599dc399 did not break
VTS which is problematic.

Test: atest VtsHalTvTunerTargetTest
Bug: 183057734
Change-Id: Id018c33c16c07a9dd9de725aea64207008d317b3
2021-11-29 19:02:12 +01:00