Commit graph

5883 commits

Author SHA1 Message Date
Shawn Willden
71344faeeb Merge "Delete KM1" am: 833a929d85 am: 22453fa420 am: 42b625b3e8
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1846575

Change-Id: Ida4deb2b9837a1275420c7742aef2535b9aa9173
2021-10-09 01:33:10 +00:00
Shawn Willden
42b625b3e8 Merge "Delete KM1" am: 833a929d85 am: 22453fa420
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1846575

Change-Id: I46a1e39f3bd5695e17ad55cea390ee9ba63c66b8
2021-10-09 01:19:58 +00:00
Shawn Willden
22453fa420 Merge "Delete KM1" am: 833a929d85
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1846575

Change-Id: Ib655ba270642c696cae1dcb58830142340dbce1c
2021-10-09 01:03:05 +00:00
Shawn Willden
833a929d85 Merge "Delete KM1" 2021-10-09 00:46:52 +00:00
Xin Li
6703053478 [automerger skipped] Merge "Merge Android 12" am: 77d993075f -s ours am: d3e53d6ea0 -s ours am: 8de78e5f89 -s ours am: 8e87d76f07 -s ours am: 7d63602f2d -s ours
am skip reason: Merged-In I9d5a74b5189e6b445ef922da0f81884d60ac82f4 with SHA-1 1a7761431d is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1847210

Change-Id: I544b2f427991582ebc62b19bf43a9456578a2757
2021-10-08 08:59:28 +00:00
Xin Li
7d63602f2d [automerger skipped] Merge "Merge Android 12" am: 77d993075f -s ours am: d3e53d6ea0 -s ours am: 8de78e5f89 -s ours am: 8e87d76f07 -s ours
am skip reason: Merged-In I9d5a74b5189e6b445ef922da0f81884d60ac82f4 with SHA-1 1a7761431d is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1847210

Change-Id: I5bc1cd3394cb169f115d7c529bc2dd9aba30d0c7
2021-10-08 08:29:18 +00:00
Xin Li
8e87d76f07 [automerger skipped] Merge "Merge Android 12" am: 77d993075f -s ours am: d3e53d6ea0 -s ours am: 8de78e5f89 -s ours
am skip reason: Merged-In I9d5a74b5189e6b445ef922da0f81884d60ac82f4 with SHA-1 1a7761431d is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1847210

Change-Id: I56319728d3efbd295657a01c888c30e76b651db0
2021-10-08 07:56:20 +00:00
Xin Li
8de78e5f89 [automerger skipped] Merge "Merge Android 12" am: 77d993075f -s ours am: d3e53d6ea0 -s ours
am skip reason: Merged-In I9d5a74b5189e6b445ef922da0f81884d60ac82f4 with SHA-1 1a7761431d is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1847210

Change-Id: I7cf686dad0de9efe6bcd664bb0cb1420578df37d
2021-10-08 01:39:04 +00:00
Xin Li
d3e53d6ea0 [automerger skipped] Merge "Merge Android 12" am: 77d993075f -s ours
am skip reason: Merged-In I9d5a74b5189e6b445ef922da0f81884d60ac82f4 with SHA-1 1a7761431d is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1847210

Change-Id: Ie4c3c0f01b8067b6a472e63c8ad6326f44e7fbbf
2021-10-08 01:19:38 +00:00
Xin Li
77d993075f Merge "Merge Android 12" 2021-10-07 23:50:16 +00:00
Xin Li
86aecefe76 Merge Android 12
Bug: 202323961
Merged-In: I9d5a74b5189e6b445ef922da0f81884d60ac82f4
Change-Id: Ie7a0d96ee03857543b7fb2bfe17ca95fc6f0c7ae
2021-10-06 22:53:41 +00:00
Shawn Willden
9bba111014 Delete KM1
Test: Build
Change-Id: I8abb9c570db05599e3d062810427859ea784d47f
2021-10-06 13:08:40 -06:00
Erik Staats
f3852875e7 dynamic_sensor: Add multi-HAL 2.1 flush support. am: 35964ba076 am: d30ecf1f7d
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/15974606

Change-Id: Ie329b87fa137b389231aac7b467a1d13652c5f76
2021-10-05 13:10:03 +00:00
Erik Staats
d30ecf1f7d dynamic_sensor: Add multi-HAL 2.1 flush support. am: 35964ba076
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/15974606

Change-Id: Ib204115b867799ecd13dd0586a97869a98d222ab
2021-10-05 13:00:16 +00:00
Erik Staats
35964ba076 dynamic_sensor: Add multi-HAL 2.1 flush support.
Bug: 201730055
Test: Verified that flush, batch, and activate sensor VTS tests pass.
Change-Id: I6721d9f8976b3ef9f6af02b2320833025b479ee6
2021-10-04 15:17:32 -07:00
Erik Staats
747b0e0592 dynamic_sensor: Add multi-HAL 2.1 sampling support. am: 43bc7bccdc am: 157804a3f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/15949542

Change-Id: Iccd67a723e6298812fe2b462e0b15b4ca1daa4de
2021-09-30 17:42:00 +00:00
Erik Staats
157804a3f7 dynamic_sensor: Add multi-HAL 2.1 sampling support. am: 43bc7bccdc
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/15949542

Change-Id: I87a4243ba0c03062ebe311a4832edd2ef7b0ae69
2021-09-30 17:28:18 +00:00
Erik Staats
43bc7bccdc dynamic_sensor: Add multi-HAL 2.1 sampling support.
Bug: 195964858
Test: Paired a Sony PS4 controller and verified it can be sampled as an
 accelerometer. The first subscription always returns all 0's, but
 subsequent subscriptions return proper accel samples.
Change-Id: I4bbc4695c988f600a62502f9fccabaa68f42c72b
2021-09-30 06:50:43 -07:00
Erik Staats
43c3fc4afe dynamic_sensor: Notify multi-HAL 2.1 of connected sensors. am: 7b29add5f7 am: 67ca088321
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/15933544

Change-Id: Id9cd784cd5467b46facda754b31e4cdcec817bff
2021-09-29 19:35:35 +00:00
Erik Staats
67ca088321 dynamic_sensor: Notify multi-HAL 2.1 of connected sensors. am: 7b29add5f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/15933544

Change-Id: If8ec6b6dd33a64ecb59a11608f6fba56876f7294
2021-09-29 19:24:10 +00:00
Erik Staats
7b29add5f7 dynamic_sensor: Notify multi-HAL 2.1 of connected sensors.
Bug: 195964858
Test: Paired a Sony PS4 controller and verified it is present in sensor
 list as an accelerometer. It can't be sampled, but the LSM6DSR
 accelerometer may still be sampled.
Change-Id: I182291cebdf84e5f6cd44d16debd6a07c4bc5281
2021-09-29 10:07:03 -07:00
Erik Staats
16fc5d543e dynamic_sensor: Add sensor manager init to sub-HAL 2.1. am: 3c7a12d8f1 am: bf866d6dd4
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/15905535

Change-Id: Icee05924819530890d509e990958af559811ea47
2021-09-24 18:05:32 +00:00
Erik Staats
bf866d6dd4 dynamic_sensor: Add sensor manager init to sub-HAL 2.1. am: 3c7a12d8f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/15905535

Change-Id: Ib2377f7425bf30da47d69557b35df158a5b9b54c
2021-09-24 17:46:31 +00:00
Erik Staats
3c7a12d8f1 dynamic_sensor: Add sensor manager init to sub-HAL 2.1.
Bug: 195964858
Test: Verified dynamic sensor manager is present in sensor list and that
 no SELinux violations occur on sc-v2-dev and master.

$ make -j28 && \
         vendor/google/tools/flashall -w -s 14281FDEE000A5 --disable_verity && \
         sleep 90 && adb root
.
.
.
$ adb shell sensor_test list | grep "sensor_test\|Type\|Dynamic"
sensor_test version 74
Type     Subtype  Name
32       0        Dynamic Sensor Manager
$ adb logcat -d | grep avc | grep sensor
$

Change-Id: Ib3da287e4f4118ad6b19498248e263f8c1662b3a
2021-09-24 06:16:51 -07:00
Erik Staats
372bc142dd Revert "dynamic_sensor: Add sensor manager init to sub-HAL 2.1." am: 1d509cf815 am: fb74ed236c
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/15886139

Change-Id: I774582c61e10555535317eb679b9d731b2ebea25
2021-09-22 18:28:17 +00:00
Erik Staats
fb74ed236c Revert "dynamic_sensor: Add sensor manager init to sub-HAL 2.1." am: 1d509cf815
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/15886139

Change-Id: I89c9076f554f804ccb467f242a4415bd3ae50756
2021-09-22 18:11:29 +00:00
Erik Staats
1d509cf815 Revert "dynamic_sensor: Add sensor manager init to sub-HAL 2.1."
Revert submission 15874906-bug_195964858.2

Reason for revert: b/200815351
Reverted Changes:
I76a60f7fb:Allow the sensor HAL to access dynamic sensor prop...
I5d587dc46:dynamic_sensor: Add sensor manager init to sub-HAL...

Change-Id: I26b95614bb276e5c2a686de78d73ab48767176a3
2021-09-22 17:53:58 +00:00
Erik Staats
023e2f2294 dynamic_sensor: Add sensor manager init to sub-HAL 2.1. am: c7038f8a78 am: 409c42afad
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/15874906

Change-Id: I790c826f327c71520a7ad20850686c41f7aaa0c5
2021-09-22 12:58:02 +00:00
Erik Staats
409c42afad dynamic_sensor: Add sensor manager init to sub-HAL 2.1. am: c7038f8a78
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/15874906

Change-Id: Ic2acf092acf17a9b528214e1521221aee8f56af2
2021-09-22 12:40:35 +00:00
Erik Staats
c7038f8a78 dynamic_sensor: Add sensor manager init to sub-HAL 2.1.
Bug: 195964858
Test: Verified dynamic sensor manager is present in sensor list and that
 no SELinux violations occur.
Test: See details in testing done comment in
 https://googleplex-android-review.git.corp.google.com/15874906 .
Change-Id: I5d587dc46bdec66c3162bf222d36b285b8d2ca3d
2021-09-20 16:58:27 -07:00
Erik Staats
ec9795eec1 Revert "dynamic_sensor: Add sensor manager init to sub-HAL 2.1." am: 3482ca5bf7 am: d1f1fbbcbc
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/15847974

Change-Id: I8452563bf0d49f7f767b0deb1097d586f2fef806
2021-09-16 23:22:23 +00:00
Erik Staats
d1f1fbbcbc Revert "dynamic_sensor: Add sensor manager init to sub-HAL 2.1." am: 3482ca5bf7
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/15847974

Change-Id: I6b03f469dc325b34299026e5ebf9edd87a00dbac
2021-09-16 23:13:14 +00:00
Erik Staats
3482ca5bf7 Revert "dynamic_sensor: Add sensor manager init to sub-HAL 2.1."
This reverts commit 28b58c62b5.

Reason for revert: 200210164

Change-Id: I6be2c972a29ec7943dbdf450ef3e491065b011a6
2021-09-16 22:58:51 +00:00
Erik Staats
913254ad60 dynamic_sensor: Add sensor manager init to sub-HAL 2.1. am: 28b58c62b5 am: e9155bf1ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/15831086

Change-Id: Id605f4fae90edd7b297242e097e06603baa0ec19
2021-09-16 22:04:51 +00:00
Erik Staats
e9155bf1ab dynamic_sensor: Add sensor manager init to sub-HAL 2.1. am: 28b58c62b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/15831086

Change-Id: If722b13e3608c77280b2406002eb35fa841930e6
2021-09-16 21:49:51 +00:00
Erik Staats
28b58c62b5 dynamic_sensor: Add sensor manager init to sub-HAL 2.1.
Bug: 195964858
Test: Verified dynamic sensor manager is present in sensor list.
Test: Test: See details in testing done comment in
 https://googleplex-android-review.git.corp.google.com/15831086 .
Change-Id: Ia34596d79f8a6c6985b35dcae75126e456f6009e
2021-09-15 13:48:11 -07:00
Erik Staats
bbc958cf17 dynamic_sensor: Add stubbed sensor multi-HAL 2.1 support. am: 2ac7393bd8 am: c939db938c
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/15806307

Change-Id: I1e7f9e8a1dc30765c4e06e7e76600a24238e5583
2021-09-14 17:38:15 +00:00
Erik Staats
c939db938c dynamic_sensor: Add stubbed sensor multi-HAL 2.1 support. am: 2ac7393bd8
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/15806307

Change-Id: I915bce8d49e26b879c4ec0b6a4d87fef55f294a3
2021-09-14 17:16:29 +00:00
Erik Staats
2ac7393bd8 dynamic_sensor: Add stubbed sensor multi-HAL 2.1 support.
Bug: 195964858
Test: Verified the dynamic sensor sub-HAL initializes and non-dynamic
 sensors can sample.
Test: See details in testing done comment in
 https://googleplex-android-review.git.corp.google.com/15806307 .
Change-Id: I59934814cc61c7319731eb840ff2132a8c5ce241
2021-09-13 15:03:51 -07:00
Xin Li
2f676b3e69 [automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 1a7761431d -s ours am: ceff5ecf17 -s ours am: b1955d7682 -s ours am: f1efde9004 -s ours
am skip reason: Merged-In I8d13832dd297c5ca7ddeb87fb5302e5bad82c309 with SHA-1 920309b25f is already in history

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

Change-Id: I021f0eae42203edf9f3708cb2be22e6b4915d739
2021-08-18 00:23:27 +00:00
Xin Li
f1efde9004 [automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 1a7761431d -s ours am: ceff5ecf17 -s ours am: b1955d7682 -s ours
am skip reason: Merged-In I8d13832dd297c5ca7ddeb87fb5302e5bad82c309 with SHA-1 920309b25f is already in history

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

Change-Id: Ib2515ec945002702c0a87143e2072eb865e78ae2
2021-08-17 20:32:08 +00:00
Xin Li
b1955d7682 [automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 1a7761431d -s ours am: ceff5ecf17 -s ours
am skip reason: Merged-In I8d13832dd297c5ca7ddeb87fb5302e5bad82c309 with SHA-1 920309b25f is already in history

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

Change-Id: Id52ca43e76f697e06a6d429064eec0b8668dc0fb
2021-08-17 19:46:04 +00:00
Xin Li
ceff5ecf17 [automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 1a7761431d -s ours
am skip reason: Merged-In I8d13832dd297c5ca7ddeb87fb5302e5bad82c309 with SHA-1 920309b25f is already in history

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

Change-Id: I38a17ffc270cc365a8b17315149d236fd4696035
2021-08-17 18:35:33 +00:00
Xin Li
1a7761431d Merge sc-dev-plus-aosp-without-vendor@7634622
Merged-In: I8d13832dd297c5ca7ddeb87fb5302e5bad82c309
Change-Id: I9d5a74b5189e6b445ef922da0f81884d60ac82f4
2021-08-14 06:30:58 +00:00
Andy Hung
9905011233 USB Audio Hal: Fix CTS timestamp handling am: 61583424ff am: 920309b25f am: acabe2f664
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/15190378

Change-Id: I5087bccb69394c54521316740b22b8e0e34e8bcb
2021-07-05 07:56:10 +00:00
Andy Hung
a2788e2ae9 USB Audio Hal: Fix CTS timestamp handling am: 61583424ff am: 980d917469 am: 3afbc70013
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/15190378

Change-Id: Ief9f17b0a77ce6c4eb008a741f702e426fdccb31
2021-07-05 07:55:50 +00:00
Andy Hung
acabe2f664 USB Audio Hal: Fix CTS timestamp handling am: 61583424ff am: 920309b25f
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/15190378

Change-Id: I527b22bfe77e3a62952e4d71a28b7f3ab935d80b
2021-07-05 07:42:38 +00:00
Andy Hung
3afbc70013 USB Audio Hal: Fix CTS timestamp handling am: 61583424ff am: 980d917469
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/15190378

Change-Id: I3230339227bc905329a2838c3bc77bcfb84747f2
2021-07-05 07:42:00 +00:00
Andy Hung
8c6e35a9d8 USB Audio Hal: Fix CTS timestamp handling am: 61583424ff am: 07c80fdaa0
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/15190378

Change-Id: I03d7042c652c6494ad4a8dd085a3895eba9b3c46
2021-07-05 07:41:36 +00:00
Andy Hung
980d917469 USB Audio Hal: Fix CTS timestamp handling am: 61583424ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/15190378

Change-Id: Ic90d8c34a120a2a98d576d583eadcc2392da844b
2021-07-05 07:32:29 +00:00