summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-12-09Merge "Fix sizeof warnings on unusual calloc"main-16k-with-phonesTreehugger Robot
2022-12-09Fix sizeof warnings on unusual callocChih-Hung Hsieh
Test: make tidy-hardware-libhardware-modules-soundtrigger_subset Change-Id: If1afcd4834461a2d1f855832dc89b8ae54bd8e2f
2022-12-05Merge "Add the second IMEI tag" am: 9e34eae550Eran Messeri
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2295117 Change-Id: I5a0a6319de0c35e9b7e4688a5e70e263bb21272f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05Merge "Add the second IMEI tag"Eran Messeri
2022-12-01Merge "Add a LINT.IfChange to sensors_event_t" am: 878d3d1c7eDevin Moore
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2320221 Change-Id: I79a9d57eaa8ab860468cfcf4ec03c79d606b8333 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-01Merge "Add a LINT.IfChange to sensors_event_t"Devin Moore
2022-11-29Add a LINT.IfChange to sensors_event_tDevin Moore
If that is changed, ASensorEvent also needs to be changed. Test: na Bug: 259711109 Change-Id: If1fdedba6a73d46b64f47490a7946954c47a3b79
2022-11-28Add the second IMEI tagEran Messeri
This CL keeps keymaster_defs.h in sync with the changes to KeymasterDefs.java. Bug: 244732345 Test: n/a Change-Id: I3dbed2c077d74ffd276ea007c165309a61f90992
2022-11-22Merge "Make libhardware host_supported" am: 65d6174bbcDevin Moore
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2305002 Change-Id: If245768b5cfe2dc69b2abc744443d464e2728bce Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22Merge "Make libhardware host_supported"Devin Moore
2022-11-17Make libhardware host_supportedDevin Moore
This requires dropping a header file and avoiding a missing strlcpy API. Required for host_supported fuzzers that include this lib. Test: libsensorserviceaidl_fuzzer Bug: 205764765 Change-Id: Ib1d2851e915ed87ef2936a044e7a72bab3077f40
2022-11-03Merge "Modify a data structure into a union." am: 8e965d90deChristopher Ferris
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2243423 Change-Id: I2672f7b1321efcd40651704db4398ffe22e370b6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-03Merge "Modify a data structure into a union."Christopher Ferris
2022-10-13Modify a data structure into a union.Christopher Ferris
The new 6.0 kernel headers changed all variable length structures from [0] to []. This causes a clang warning to trigger, so rewrite the affected data structure using a union to avoid having a variable sized array in the middle of the structure. Test: Builds. Change-Id: I60c6d31a93566c4aa9f7501f39f88543ee76ce91
2022-09-09Merge "[dynamic_sensor] correctly interpret HID data" am: dcbe8650b6 am: ↵Treehugger Robot
69f047a046 am: 28bb4526f9 am: 9a2c8265c6 Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2213197 Change-Id: I17592fb7e35a0fafc80ef668cbeac837c02b8b08 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-09Merge "[dynamic_sensor] correctly interpret HID data" am: dcbe8650b6 am: ↵Treehugger Robot
69f047a046 am: 28bb4526f9 Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2213197 Change-Id: I5b68a48d18e23efd557e4661d02f53a29f59a35c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-09Merge "[dynamic_sensor] correctly interpret HID data" am: dcbe8650b6 am: ↵Treehugger Robot
69f047a046 Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2213197 Change-Id: Id17fc1b60204e3d6b552763afaab6dd0680d6fa8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-09Merge "[dynamic_sensor] correctly interpret HID data" am: dcbe8650b6Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2213197 Change-Id: Iee9bef8c7260cf13e075381631a55c08f0e0f4dc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-09Merge "[dynamic_sensor] correctly interpret HID data"Treehugger Robot
2022-09-09[dynamic_sensor] correctly interpret HID dataManish Kushwaha
specifically, interpret HID data value as unsigned if minValue is positive Fix: 238391386 Test: See "Testing Done" in comments in ag/19889364 Change-Id: I715c2189ad90ee71e022ae131354354157694556
2022-08-25Merge "Clarify and clean up dynamic_sensor documentation" am: 4d919104dd am: ↵Treehugger Robot
a43e51cb45 am: d43f111175 am: 530caa4d82 Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2194872 Change-Id: Ib583fbe593dc9d3a670d3eaf12142192658802c4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-25Merge "Clarify and clean up dynamic_sensor documentation" am: 4d919104dd am: ↵Treehugger Robot
a43e51cb45 am: d43f111175 Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2194872 Change-Id: Id252685bebe7755eeb5d37d26feaab2cf5010415 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-25Merge "Clarify and clean up dynamic_sensor documentation" am: 4d919104dd am: ↵Treehugger Robot
a43e51cb45 Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2194872 Change-Id: I1e76e9569e38d1ede2ccbfb4dd1488d9137fa6c9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-25Merge "Clarify and clean up dynamic_sensor documentation" am: 4d919104ddTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2194872 Change-Id: Idc7bc16392d0dea3c93e8b6c83b537ce3e64816b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-25Merge "Clarify and clean up dynamic_sensor documentation"Treehugger Robot
2022-08-24Clarify and clean up dynamic_sensor documentationBrian Duddie
Test: n/a Change-Id: I0b0226b1fce940bd37b8d8a1f72123948ff1fe0a
2022-08-24Merge "[Bluetooth apex] Use new apex name" am: 5c5651cf2c am: 687bb61d2e am: ↵Treehugger Robot
52a73cdb91 am: 8d666ed762 Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/2192198 Change-Id: Ibffaead2d67d468c6bf32b9058f5cc14831e2e90 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-24Merge "[Bluetooth apex] Use new apex name" am: 5c5651cf2c am: 687bb61d2e am: ↵Treehugger Robot
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-24Merge "[Bluetooth apex] Use new apex name" am: 5c5651cf2c am: 687bb61d2eTreehugger Robot
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-24Merge "[Bluetooth apex] Use new apex name" am: 5c5651cf2cTreehugger Robot
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-24Merge "[Bluetooth apex] Use new apex name"Treehugger Robot
2022-08-22[Bluetooth apex] Use new apex nameWilliam Escande
The Bluetooth apex name is now called com.android.btservices Bug: 243054261 Test: Build Change-Id: Ie016fa354f5c9516b2f9a671f2235787f92da37d
2022-08-16[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: e6ba398cb2 ↵Xin Li
-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[automerger skipped] DO NOT MERGE - Merge Android 13 am: 7bc1119b8a -s ours ↵Xin Li
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[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: e6ba398cb2 ↵Xin Li
-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[automerger skipped] DO NOT MERGE - Merge Android 13 am: 7bc1119b8a -s ours ↵Xin Li
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[automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: e6ba398cb2 ↵Xin Li
-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[automerger skipped] DO NOT MERGE - Merge Android 13 am: 7bc1119b8a -s oursXin Li
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-16Merge "DO NOT MERGE - Merge Android 13"Xin Li
2022-08-15DO NOT MERGE - Merge Android 13Xin Li
Bug: 242648940 Merged-In: I4bc1a7cb4af2c49d6f1343843cf86c436294bed7 Change-Id: I1ea69ee0fb89d079bbd712ea8f13717ceb2fb6e6
2022-07-28Merge "Remove explicit dependency on libdl" am: 2cac8b9f81 am: db72a6dfe4 ↵Treehugger Robot
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-28Merge "Remove explicit dependency on libdl" am: 2cac8b9f81 am: db72a6dfe4 ↵Treehugger Robot
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-28Merge "Remove explicit dependency on libdl" am: 2cac8b9f81 am: db72a6dfe4Treehugger Robot
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-28Merge "Remove explicit dependency on libdl" am: 2cac8b9f81temp_sam_242648940Treehugger Robot
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-06-30[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li
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-29[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li
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[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: ↵Xin Li
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-27Merge tm-dev-plus-aosp-without-vendor@8763363Xin Li
Bug: 236760014 Merged-In: If82a5bf302cb68a2c5b486006e4679fbfc8ee545 Change-Id: I9f63475a68f386bbb8ad768a8f2075e6c3c55eaa
2022-06-17[automerger skipped] Merge "Merge Android 12 QPR 3" am: b0eb536590 -s ours ↵Xin Li
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[automerger skipped] Merge Android 12 QPR 3 am: 9e5c95612b -s ours am: ↵Xin Li
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>