Commit graph

5883 commits

Author SHA1 Message Date
Treehugger Robot
8d666ed762 Merge "[Bluetooth apex] Use new apex name" am: 5c5651cf2c am: 687bb61d2e am: 52a73cdb91
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2192198

Change-Id: Ica8610821fc2119c0b2e1edf971412ac6b43413f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-24 02:01:16 +00:00
Treehugger Robot
52a73cdb91 Merge "[Bluetooth apex] Use new apex name" am: 5c5651cf2c am: 687bb61d2e
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2192198

Change-Id: I189149ffa16443415a671c869a3e48334ec35b5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-24 01:34:18 +00:00
Treehugger Robot
687bb61d2e Merge "[Bluetooth apex] Use new apex name" am: 5c5651cf2c
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2192198

Change-Id: Ic7c9233e5c0c15c929f4c0b60ab4b9cce80907b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-24 01:04:31 +00:00
Treehugger Robot
5c5651cf2c Merge "[Bluetooth apex] Use new apex name" 2022-08-24 00:13:29 +00:00
William Escande
4db625386f [Bluetooth apex] Use new apex name
The Bluetooth apex name is now called com.android.btservices

Bug: 243054261
Test: Build
Change-Id: Ie016fa354f5c9516b2f9a671f2235787f92da37d
2022-08-22 11:27:59 -07:00
Xin Li
09f7350d30 [automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: e6ba398cb2 -s ours am: f5a3b35846 -s ours am: dccdafa65f -s ours
am skip reason: Merged-In I4bc1a7cb4af2c49d6f1343843cf86c436294bed7 with SHA-1 3e805478fb is already in history

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

Change-Id: Ic0a815a3892bab38c53844f570f9af21af7c4055
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 23:35:29 +00:00
Xin Li
17346ff4b5 [automerger skipped] DO NOT MERGE - Merge Android 13 am: 7bc1119b8a -s ours am: a40a523408 -s ours am: 1a5ba00f6e -s ours
am skip reason: Merged-In I4bc1a7cb4af2c49d6f1343843cf86c436294bed7 with SHA-1 3e805478fb is already in history

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

Change-Id: I118178f19e4a9b856073da4841ec80d168541396
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 23:35:28 +00:00
Xin Li
dccdafa65f [automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: e6ba398cb2 -s ours am: f5a3b35846 -s ours
am skip reason: Merged-In I4bc1a7cb4af2c49d6f1343843cf86c436294bed7 with SHA-1 3e805478fb is already in history

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

Change-Id: Ie7cd06a3617312a558151cb6ecd34c2ab9d7b819
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 23:08:26 +00:00
Xin Li
1a5ba00f6e [automerger skipped] DO NOT MERGE - Merge Android 13 am: 7bc1119b8a -s ours am: a40a523408 -s ours
am skip reason: Merged-In I4bc1a7cb4af2c49d6f1343843cf86c436294bed7 with SHA-1 3e805478fb is already in history

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

Change-Id: I4a7fff67fd8d30d4b66cdf42707ea5fbdc4e6e00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 23:08:23 +00:00
Xin Li
f5a3b35846 [automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: e6ba398cb2 -s ours
am skip reason: Merged-In I4bc1a7cb4af2c49d6f1343843cf86c436294bed7 with SHA-1 3e805478fb is already in history

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

Change-Id: I2efad3c53a46a0bed60b8b1a792ee133c4cd2f08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 22:43:27 +00:00
Xin Li
a40a523408 [automerger skipped] DO NOT MERGE - Merge Android 13 am: 7bc1119b8a -s ours
am skip reason: Merged-In I4bc1a7cb4af2c49d6f1343843cf86c436294bed7 with SHA-1 3e805478fb is already in history

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

Change-Id: I1dee1f5309854326479924ae75923733fbfbdba8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 22:43:25 +00:00
Xin Li
e6ba398cb2 Merge "DO NOT MERGE - Merge Android 13" 2022-08-16 19:08:18 +00:00
Xin Li
7bc1119b8a DO NOT MERGE - Merge Android 13
Bug: 242648940
Merged-In: I4bc1a7cb4af2c49d6f1343843cf86c436294bed7
Change-Id: I1ea69ee0fb89d079bbd712ea8f13717ceb2fb6e6
2022-08-15 22:03:53 -07:00
Treehugger Robot
2feeb0d81a Merge "Remove explicit dependency on libdl" am: 2cac8b9f81 am: db72a6dfe4 am: 7d03380dc5 am: b9440f4d34
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2123559

Change-Id: Idff3a7635726b44179c6435cf04f9a251139a1b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-28 21:43:04 +00:00
Treehugger Robot
b9440f4d34 Merge "Remove explicit dependency on libdl" am: 2cac8b9f81 am: db72a6dfe4 am: 7d03380dc5
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2123559

Change-Id: I01d34f64a1a51b158f0f3d6a57cbc73dae23b7ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-28 21:17:19 +00:00
Treehugger Robot
7d03380dc5 Merge "Remove explicit dependency on libdl" am: 2cac8b9f81 am: db72a6dfe4
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2123559

Change-Id: Ief1de7e725f10747b817034bf4aaaf1bcbd61f4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-28 20:50:45 +00:00
Treehugger Robot
db72a6dfe4 Merge "Remove explicit dependency on libdl" am: 2cac8b9f81
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2123559

Change-Id: Ib0c0faf87d987634a7923be276033cc1b5eb13a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-28 20:17:48 +00:00
Xin Li
fd87046171 [automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 7c0bc319e9 -s ours am: 4849805f97 -s ours am: ef4929fa89 -s ours
am skip reason: Merged-In If82a5bf302cb68a2c5b486006e4679fbfc8ee545 with SHA-1 3493565708 is already in history

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

Change-Id: I215bf638bcc654a3fc343f4d33a8c397df257cc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 00:01:55 +00:00
Xin Li
ef4929fa89 [automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 7c0bc319e9 -s ours am: 4849805f97 -s ours
am skip reason: Merged-In If82a5bf302cb68a2c5b486006e4679fbfc8ee545 with SHA-1 3493565708 is already in history

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

Change-Id: I2f9a0c7a51be8907024e039127863ce813a5539e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29 22:56:11 +00:00
Xin Li
4849805f97 [automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 7c0bc319e9 -s ours
am skip reason: Merged-In If82a5bf302cb68a2c5b486006e4679fbfc8ee545 with SHA-1 3493565708 is already in history

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

Change-Id: Id86ed96790d0124e512d88d0109b0598f84be33b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29 22:12:41 +00:00
Xin Li
7c0bc319e9 Merge tm-dev-plus-aosp-without-vendor@8763363
Bug: 236760014
Merged-In: If82a5bf302cb68a2c5b486006e4679fbfc8ee545
Change-Id: I9f63475a68f386bbb8ad768a8f2075e6c3c55eaa
2022-06-27 23:38:54 +00:00
Xin Li
4f8221df40 [automerger skipped] Merge "Merge Android 12 QPR 3" am: b0eb536590 -s ours am: 7c9cf4930a -s ours am: 97dbb73578 -s ours am: e746e3538c -s ours
am skip reason: Merged-In I36e233dc5b59feec9354f9aef6f231babbbcec6f with SHA-1 c41d9de876 is already in history

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

Change-Id: Ief2caa3abfc34479d01548afe465b32a79130bd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 20:53:44 +00:00
Xin Li
cf3e62a8ee [automerger skipped] Merge Android 12 QPR 3 am: 9e5c95612b -s ours am: be6d94e0dd -s ours am: 4c81cb72ef -s ours am: 468e587660 -s ours
am skip reason: Merged-In I36e233dc5b59feec9354f9aef6f231babbbcec6f with SHA-1 c41d9de876 is already in history

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

Change-Id: I64d4bfb40bcc543f412087c8be95db6e3207136d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 20:52:36 +00:00
Xin Li
e746e3538c [automerger skipped] Merge "Merge Android 12 QPR 3" am: b0eb536590 -s ours am: 7c9cf4930a -s ours am: 97dbb73578 -s ours
am skip reason: Merged-In I36e233dc5b59feec9354f9aef6f231babbbcec6f with SHA-1 c41d9de876 is already in history

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

Change-Id: I6088a2ab0b25f0dd3dd26aa65fb008fadb8dd7a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 19:57:25 +00:00
Xin Li
468e587660 [automerger skipped] Merge Android 12 QPR 3 am: 9e5c95612b -s ours am: be6d94e0dd -s ours am: 4c81cb72ef -s ours
am skip reason: Merged-In I36e233dc5b59feec9354f9aef6f231babbbcec6f with SHA-1 c41d9de876 is already in history

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

Change-Id: I1dad8425453c0b1b95e1a8823be459fa5795b552
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 19:56:17 +00:00
Treehugger Robot
2cac8b9f81 Merge "Remove explicit dependency on libdl" 2022-06-17 00:18:40 +00:00
Xin Li
97dbb73578 [automerger skipped] Merge "Merge Android 12 QPR 3" am: b0eb536590 -s ours am: 7c9cf4930a -s ours
am skip reason: Merged-In I36e233dc5b59feec9354f9aef6f231babbbcec6f with SHA-1 c41d9de876 is already in history

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

Change-Id: Iac40bb50d65ba3b7ec38d8e1e551fc4524a2f8e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 00:15:19 +00:00
Xin Li
4c81cb72ef [automerger skipped] Merge Android 12 QPR 3 am: 9e5c95612b -s ours am: be6d94e0dd -s ours
am skip reason: Merged-In I36e233dc5b59feec9354f9aef6f231babbbcec6f with SHA-1 c41d9de876 is already in history

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

Change-Id: I43e9f699fb6fb876f992530a5c5bf22184afe3d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 00:14:13 +00:00
Xin Li
7c9cf4930a [automerger skipped] Merge "Merge Android 12 QPR 3" am: b0eb536590 -s ours
am skip reason: Merged-In I36e233dc5b59feec9354f9aef6f231babbbcec6f with SHA-1 c41d9de876 is already in history

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

Change-Id: I7e76b76be8e6b011c5ad8fdc2bb6499b555bb018
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-16 19:58:19 +00:00
Xin Li
be6d94e0dd [automerger skipped] Merge Android 12 QPR 3 am: 9e5c95612b -s ours
am skip reason: Merged-In I36e233dc5b59feec9354f9aef6f231babbbcec6f with SHA-1 c41d9de876 is already in history

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

Change-Id: Ice06d9e2407d1f617c7e95744b3e8d9513c724b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-16 19:57:06 +00:00
Xin Li
b0eb536590 Merge "Merge Android 12 QPR 3" 2022-06-16 18:51:54 +00:00
Xin Li
9e5c95612b Merge Android 12 QPR 3
Bug: 236045730
Merged-In: I36e233dc5b59feec9354f9aef6f231babbbcec6f
Change-Id: Ie3de5c4a7566ae5ed6bc2e3549029d7d42cfc27c
2022-06-14 16:48:12 -07:00
Liz Kammer
3e805478fb Remove explicit dependency on libdl
A dependency to libdl is added by default by the build system based on
system_dynamic_libs property.

Test: m libhardware
Change-Id: I4bc1a7cb4af2c49d6f1343843cf86c436294bed7
2022-06-13 17:52:48 +00:00
Erik Staats
8220eb4ee9 Add /dev permissions to dynamic sensor README.md . am: 3493565708 am: 0c8d140c5c
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/17866052

Change-Id: Ia52c1c97ccd8f817e221a539543a763e0ca7d8cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 21:20:01 +00:00
Erik Staats
0c8d140c5c Add /dev permissions to dynamic sensor README.md . am: 3493565708
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/17866052

Change-Id: Ied7f878e32da7e34df04675d7a1c5aa1d99fc2ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 21:04:16 +00:00
Erik Staats
3493565708 Add /dev permissions to dynamic sensor README.md .
Bug: 228879057
Test: Verified in gitiles.
Change-Id: If82a5bf302cb68a2c5b486006e4679fbfc8ee545
2022-04-20 11:16:52 -07:00
Erik Staats
28db890260 dynamic_sensor: Fix HID min/max sample rate computation. am: fdb42f78cd am: d3fe4999ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/17625408

Change-Id: Ia4ae404dbda24a35f7d8c6b59656febbb5fe70fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 23:29:12 +00:00
Erik Staats
d3fe4999ca dynamic_sensor: Fix HID min/max sample rate computation. am: fdb42f78cd
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/17625408

Change-Id: I80a1bdb1cbbbd54afea4f2606a2285d4bfb870ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 23:11:17 +00:00
Erik Staats
fdb42f78cd dynamic_sensor: Fix HID min/max sample rate computation.
Bug: 228369656
Test: Used uhid-sample to add a dynamic sensor and verified correct
 min/max sample rate.
Change-Id: I88a1bec26a03a97ee7a3c590d2601151b89ee545
2022-04-06 15:30:02 -07:00
Erik Staats
295403ba48 dynamic_sensor: Support timing out sensor operations. am: 9b8bc0f7c1 am: fb93d2f677
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/17542700

Change-Id: I0f7fba86f3b6647ab1a9e8d1b8592190ab584488
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 13:16:30 +00:00
Erik Staats
fb93d2f677 dynamic_sensor: Support timing out sensor operations. am: 9b8bc0f7c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/17542700

Change-Id: I1569d6a89f8367de8acdd4863b78818bd2d29532
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 12:57:20 +00:00
Erik Staats
9b8bc0f7c1 dynamic_sensor: Support timing out sensor operations.
Bug: 226012902
Test: Used uhid-sample to add a dynamic sensor and verified it can be
 sampled.
Test: Simulated start sampling ioctl timeout and verified operation
 completes with a timeout and eventually cleans up.
Test: Simulated start sampling ioctl timeout with device removal before
 completion and verified operation completes with a timeout and
 eventually cleans up.
Change-Id: I9a957bc1e4000b2c587278146ecbe6e903010616
2022-04-06 12:42:06 +00:00
Xin Li
73860d9f24 [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: c86c769102 -s ours am: c41d9de876 -s ours am: 97fa686b5d -s ours am: e8e241d099 -s ours
am skip reason: Merged-In I11cfdae56524722afd33ee3c01fdb3c1559d8c85 with SHA-1 edfcd7d421 is already in history

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

Change-Id: I1c9bc9ff3d0ea84a10343a81acfdf3ff86ac5513
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03 09:08:41 +00:00
Xin Li
e8e241d099 [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: c86c769102 -s ours am: c41d9de876 -s ours am: 97fa686b5d -s ours
am skip reason: Merged-In I11cfdae56524722afd33ee3c01fdb3c1559d8c85 with SHA-1 edfcd7d421 is already in history

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

Change-Id: I8f431ec7e02f313ef73567d3e3b3dbd4414738fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03 08:30:47 +00:00
Xin Li
97fa686b5d [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: c86c769102 -s ours am: c41d9de876 -s ours
am skip reason: Merged-In I11cfdae56524722afd33ee3c01fdb3c1559d8c85 with SHA-1 edfcd7d421 is already in history

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

Change-Id: Iaf074ba904bcb417005de1f7bec88c228f63828f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03 07:43:37 +00:00
Xin Li
c41d9de876 [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: c86c769102 -s ours
am skip reason: Merged-In I11cfdae56524722afd33ee3c01fdb3c1559d8c85 with SHA-1 edfcd7d421 is already in history

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

Change-Id: I36e233dc5b59feec9354f9aef6f231babbbcec6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03 07:11:36 +00:00
Xin Li
c86c769102 Merge Android 12 QPR3 ab/8391262
Bug: 226662282
Merged-In: I11cfdae56524722afd33ee3c01fdb3c1559d8c85
Change-Id: I517f7a7454372f79f959df33c13b26202080e33c
2022-04-01 20:32:38 +00:00
Brian Duddie
bcde47bb63 Change dynamic sensors handle base to 1 am: b9769d799c am: 82f2fc8e6c
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/17542038

Change-Id: I03799fae33f04758975841e00a1e8a583b58ee7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 19:34:05 +00:00
Brian Duddie
82f2fc8e6c Change dynamic sensors handle base to 1 am: b9769d799c
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/17542038

Change-Id: I48902f711c5ff979e493ab72497c9b8e433bbe24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 19:12:29 +00:00
Brian Duddie
b9769d799c Change dynamic sensors handle base to 1
Fixes: 227766975
Test: load on device, confirm handle number changed
Change-Id: I0466784d7e468bd785f2525f1ab7cd02cc5436e8
2022-04-01 17:22:31 +00:00