Commit graph

5852 commits

Author SHA1 Message Date
Yifan Hong
bb1479b00b Use libgtest_prod_headers.
Test: builds
Bug: 185916167
Change-Id: Ifdb71aa9e6e9eeadd4d7c9cb4850832650dd12e8
2021-04-26 16:36:38 -07:00
Treehugger Robot
f048692f9b Merge "r_submix: Implement get_capture_position" am: 6ca3fb08ca am: 38e37ba4c6 am: ffabaf42ef am: 41628fee87
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1642345

Change-Id: Ic5d0f696df4e0ae0afd78f4c0fda57043993687e
2021-03-22 13:56:43 +00:00
Treehugger Robot
2eef3d4a28 Merge "r_submix: Implement get_capture_position" am: 6ca3fb08ca am: 38e37ba4c6 am: ffabaf42ef am: 41628fee87
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1642345

Change-Id: Icbd7bd21363fdaa356bdabb988a4986b9c16d4f7
2021-03-22 13:33:02 +00:00
Treehugger Robot
41628fee87 Merge "r_submix: Implement get_capture_position" am: 6ca3fb08ca am: 38e37ba4c6 am: ffabaf42ef
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1642345

Change-Id: I3abaeee2a533fbd6b4f989ae6770bd724d96e295
2021-03-22 10:44:23 +00:00
Treehugger Robot
ffabaf42ef Merge "r_submix: Implement get_capture_position" am: 6ca3fb08ca am: 38e37ba4c6
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1642345

Change-Id: Id212ce97c334db8cde44781065f70344c183cf40
2021-03-22 09:55:02 +00:00
Treehugger Robot
38e37ba4c6 Merge "r_submix: Implement get_capture_position" am: 6ca3fb08ca
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1642345

Change-Id: I51c3439b5427c593755f8b46be56a05abc70064a
2021-03-22 09:14:45 +00:00
Treehugger Robot
6ca3fb08ca Merge "r_submix: Implement get_capture_position" 2021-03-22 08:40:25 +00:00
Treehugger Robot
2bf9030602 [automerger skipped] Merge "Update oob data struct" am: f2c4a568cc am: a0662b0c10 am: 157000483e -s ours am: a78ed07b45 -s ours
am skip reason: skip tag Change-Id Ia06b8c65cac45694a3a9f01ca73bf6e0b3010d06 with SHA-1 63e4dc0237 is already in history

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

Change-Id: I27c996e1840232db18073365d55ebe01f4b86f1c
2021-03-19 23:07:37 +00:00
Treehugger Robot
ab8b9f5710 [automerger skipped] Merge "Update oob data struct" am: f2c4a568cc am: a0662b0c10 am: 157000483e -s ours am: a78ed07b45 -s ours
am skip reason: skip tag Change-Id Ia06b8c65cac45694a3a9f01ca73bf6e0b3010d06 with SHA-1 63e4dc0237 is already in history

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

Change-Id: Ifdbb3467d51e4e00481691dc365543e15d02d28b
2021-03-19 23:07:09 +00:00
Treehugger Robot
a78ed07b45 [automerger skipped] Merge "Update oob data struct" am: f2c4a568cc am: a0662b0c10 am: 157000483e -s ours
am skip reason: skip tag Change-Id Ia06b8c65cac45694a3a9f01ca73bf6e0b3010d06 with SHA-1 63e4dc0237 is already in history

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

Change-Id: I778d15970443651b3b33287710cf545d687ea305
2021-03-19 22:51:00 +00:00
Treehugger Robot
157000483e Merge "Update oob data struct" am: f2c4a568cc am: a0662b0c10
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1636699

Change-Id: I589fdd3ed84c0221059a8c87cae1eae217aeb594
2021-03-19 22:10:33 +00:00
Treehugger Robot
a0662b0c10 Merge "Update oob data struct" am: f2c4a568cc
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1636699

Change-Id: I3c401d8fed1fcaf012fcf6947e266e0650934614
2021-03-19 21:37:27 +00:00
Treehugger Robot
f2c4a568cc Merge "Update oob data struct" 2021-03-19 21:13:18 +00:00
Mikhail Naganov
8c97d24e3a r_submix: Implement get_capture_position
IStream.getCapturePosition becomes mandatory in
audio HAL V7. The legacy implementation must
provide it for the default HAL implementation.

Bug: 161253754
Test: atest VtsHalAudioV7_0TargetTest
Change-Id: I2f2094f0499ba85f53f291e0a269211981b4c9d8
2021-03-17 13:19:49 -07:00
Martin Brabham
7094c89e5c Update oob data struct
Bug: 178007935
Test: compiles and runs
Tag: #feature
Change-Id: Ia06b8c65cac45694a3a9f01ca73bf6e0b3010d06
Merged-In: Ia06b8c65cac45694a3a9f01ca73bf6e0b3010d06
2021-03-15 19:29:22 +00:00
Martin Brabham
1df2577f40 Update oob data struct am: 63e4dc0237
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/13842371

Change-Id: Ic72b7da1c2399e4ec046b08417739f2680ba0f4e
2021-03-15 17:47:05 +00:00
Martin Brabham
ef8610b27b Update oob data struct am: 63e4dc0237
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/libhardware/+/13842371

Change-Id: If83bb4beb7fa9102ace207db609cffb7149cda6b
2021-03-15 17:28:17 +00:00
Martin Brabham
63e4dc0237 Update oob data struct
Bug: 178007935
Test: compiles and runs
Tag: #feature
Change-Id: Ia06b8c65cac45694a3a9f01ca73bf6e0b3010d06
2021-03-15 10:22:11 -07:00
Paul Crowley
29d32e7e43 Merge "Add MAX_BOOT_LEVEL tag, BOOT_LEVEL_EXCEEDED error" am: 43972e7d10 am: e92e08a8a4 am: 62b0336ba4 am: 248ac03b14
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1581935

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9980d1c59a613aab271483b8fc6b2a95e5fb929a
2021-03-01 17:25:45 +00:00
Paul Crowley
3ce0965b3f Merge "Add MAX_BOOT_LEVEL tag, BOOT_LEVEL_EXCEEDED error" am: 43972e7d10 am: e92e08a8a4 am: 62b0336ba4 am: 248ac03b14
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1581935

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2c45a3961cb0c736e8ebe00e563627d0c16f43e3
2021-03-01 09:05:26 +00:00
Paul Crowley
248ac03b14 Merge "Add MAX_BOOT_LEVEL tag, BOOT_LEVEL_EXCEEDED error" am: 43972e7d10 am: e92e08a8a4 am: 62b0336ba4
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1581935

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idd13d8f749112c01a9eb0a77c6d3975e2bc421ff
2021-03-01 08:06:31 +00:00
Paul Crowley
62b0336ba4 Merge "Add MAX_BOOT_LEVEL tag, BOOT_LEVEL_EXCEEDED error" am: 43972e7d10 am: e92e08a8a4
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1581935

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I93ac1f32ccc574893cd961d453c4b699b843e5e2
2021-02-27 08:23:13 +00:00
Paul Crowley
e92e08a8a4 Merge "Add MAX_BOOT_LEVEL tag, BOOT_LEVEL_EXCEEDED error" am: 43972e7d10
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1581935

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I26af986c4429e48c6ec492c8bf32a34931e9e585
2021-02-27 07:25:36 +00:00
Paul Crowley
43972e7d10 Merge "Add MAX_BOOT_LEVEL tag, BOOT_LEVEL_EXCEEDED error" 2021-02-27 05:05:50 +00:00
Xin Li
ec5b921a5f [automerger skipped] Mark ab/7061308 as merged in stage. am: 706a6ab36d -s ours am: fb880b4133 -s ours am: 218e0c7bd9 -s ours
am skip reason: Change-Id I6b99e5e590504bda7f681ae6cdd7557f74402378 with SHA-1 afd797f823 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I54129ebc02cdca355ae1edaa576e58d50dac7f46
2021-02-20 18:19:55 +00:00
Xin Li
64e35bb891 [automerger skipped] Mark ab/7061308 as merged in stage. am: 706a6ab36d -s ours am: fb880b4133 -s ours am: 218e0c7bd9 -s ours
am skip reason: Change-Id I6b99e5e590504bda7f681ae6cdd7557f74402378 with SHA-1 afd797f823 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I40ce2edee1fb602314ebf9be40414e9f07de0020
2021-02-20 18:14:20 +00:00
Bob Badour
bf30e416cf Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/libhardware" am: a3888bdcb9 am: c623db5c2c am: 254f2f1062 am: df8e00240f
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1588486

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2cddb5b0a51fe3eec402b49c2e32772e39d1e0ef
2021-02-20 18:07:58 +00:00
Bob Badour
2c1b0337fd Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/libhardware" am: a3888bdcb9 am: c623db5c2c am: 254f2f1062 am: df8e00240f
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1588486

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I57df35dcd3f0eb944063651a79c531194e3f1214
2021-02-20 18:07:39 +00:00
Xin Li
218e0c7bd9 [automerger skipped] Mark ab/7061308 as merged in stage. am: 706a6ab36d -s ours am: fb880b4133 -s ours
am skip reason: Change-Id I6b99e5e590504bda7f681ae6cdd7557f74402378 with SHA-1 afd797f823 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If81c8ccdc5de1a5e4a8856421d31eabbedb11a14
2021-02-20 17:29:01 +00:00
Bob Badour
df8e00240f Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/libhardware" am: a3888bdcb9 am: c623db5c2c am: 254f2f1062
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1588486

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I94a1f76615214a26e33712c0a351ace4f0126527
2021-02-20 17:22:58 +00:00
Xin Li
fb880b4133 [automerger skipped] Mark ab/7061308 as merged in stage. am: 706a6ab36d -s ours
am skip reason: Change-Id I6b99e5e590504bda7f681ae6cdd7557f74402378 with SHA-1 afd797f823 is in history

Original change: undetermined

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7b6a64310951a60c31aed3907fef4fa197228c23
2021-02-20 12:04:53 +00:00
Xin Li
706a6ab36d Mark ab/7061308 as merged in stage.
Bug: 180401296
Merged-In: I6b99e5e590504bda7f681ae6cdd7557f74402378
Change-Id: I95c93d049f84bb0b88d87533ade5f7cf715e074f
2021-02-20 00:24:30 -08:00
Bob Badour
254f2f1062 Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/libhardware" am: a3888bdcb9 am: c623db5c2c
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1588486

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2dd468eb50943dbfc53b443c84ba8fe87ae76a45
2021-02-19 02:25:24 +00:00
Bob Badour
c623db5c2c Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/libhardware" am: a3888bdcb9
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1588486

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ice476cfd865dc5b9ef4a03006800505aff83c4b0
2021-02-19 00:58:31 +00:00
Bob Badour
a3888bdcb9 Merge "[LSC] Add LOCAL_LICENSE_KINDS to hardware/libhardware" 2021-02-18 23:43:48 +00:00
Paul Crowley
1f4800f20a Add MAX_BOOT_LEVEL tag, BOOT_LEVEL_EXCEEDED error
Test: Treehugger
Bug: 176450483
Change-Id: Ibfc838496fec507dbe4831e86b933666296a4b35
2021-02-18 09:50:56 -08:00
Shawn Willden
0b7655550d Merge "Add ATTEST_KEY" am: 41e68bfb11 am: a5d7ebd9a3 am: d34829254c am: 6cb2144e0e
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1584435

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib43d50eb153030cfa52757344618983e9e4dcd42
2021-02-17 21:05:39 +00:00
Shawn Willden
c4086375ff Merge "Add ATTEST_KEY" am: 41e68bfb11 am: a5d7ebd9a3 am: d34829254c am: 6cb2144e0e
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1584435

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3dcebd6fc27e207911bcef013825f2b243647ebd
2021-02-17 21:05:25 +00:00
Shawn Willden
6cb2144e0e Merge "Add ATTEST_KEY" am: 41e68bfb11 am: a5d7ebd9a3 am: d34829254c
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1584435

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5b34e86622d8b0505ed76621cf2ebbce1b9190fd
2021-02-17 20:49:09 +00:00
Shawn Willden
d34829254c Merge "Add ATTEST_KEY" am: 41e68bfb11 am: a5d7ebd9a3
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1584435

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieda93f65ca1c441e85bb5351450c0e4684142ee7
2021-02-17 20:14:55 +00:00
Shawn Willden
a5d7ebd9a3 Merge "Add ATTEST_KEY" am: 41e68bfb11
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1584435

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I909a2e2b5aad3d1bcce88f055a4569621a6c97df
2021-02-17 19:42:22 +00:00
Shawn Willden
41e68bfb11 Merge "Add ATTEST_KEY" 2021-02-17 19:12:20 +00:00
Bob Badour
d7984ccf02 [LSC] Add LOCAL_LICENSE_KINDS to hardware/libhardware
Added SPDX-license-identifier-Apache-2.0 to:
  modules/audio/Android.bp
  modules/audio_remote_submix/Android.bp
  modules/audio_remote_submix/tests/Android.bp
  modules/camera/3_0/Android.bp
  modules/consumerir/Android.bp
  modules/fingerprint/Android.bp
  modules/gralloc/Android.mk
  modules/hwcomposer/Android.bp
  modules/input/evdev/Android.bp
  modules/local_time/Android.bp
  modules/nfc-nci/Android.bp
  modules/nfc/Android.bp
  modules/power/Android.bp
  modules/radio/Android.bp
  modules/sensors/Android.bp
  modules/sensors/Android.mk
  modules/sensors/dynamic_sensor/Android.bp
  modules/sensors/dynamic_sensor/HidUtils/Android.bp
  modules/soundtrigger/Android.bp
  modules/thermal/Android.bp
  modules/tv_input/Android.bp
  modules/usbaudio/Android.bp
  modules/usbcamera/Android.bp
  modules/vibrator/Android.bp
  modules/vr/Android.bp
  tests/camera3/Android.bp
  tests/fingerprint/Android.bp
  tests/hardware/Android.bp
  tests/hwc/Android.bp
  tests/input/evdev/Android.bp
  tests/nusensors/Android.bp

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD to:
  Android.bp
  modules/camera/3_4/Android.mk

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I28924363e6c478f5d0b465b63534c4efd041c770
2021-02-12 20:51:13 -08:00
Shawn Willden
46c5244839 Add ATTEST_KEY
Bug: 171845787
Test: Build
Change-Id: I41451eb35dd0992c049525782e7afb5228ed6b3f
2021-02-11 07:50:39 -07:00
Janis Danisevskis
7ca23cbbca Merge "Keymint: Add CERTIFICATE_* tags" am: ead6cd16d8 am: 864b71f5ff am: 381ce9a86a am: 70ded94cf6
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1566355

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I35aec1237d0adc19f3daf0f17659ef5261d33d3c
2021-02-08 18:36:22 +00:00
Janis Danisevskis
a79913f4ef Merge "Keymint: Add CERTIFICATE_* tags" am: ead6cd16d8 am: 864b71f5ff am: 381ce9a86a am: 70ded94cf6
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1566355

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6027c0560dfb9fea2bdb226fc99550cddda88009
2021-02-08 18:36:14 +00:00
Janis Danisevskis
70ded94cf6 Merge "Keymint: Add CERTIFICATE_* tags" am: ead6cd16d8 am: 864b71f5ff am: 381ce9a86a
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1566355

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie7367906d87ad83713c3500a613d74ee1e1da401
2021-02-08 17:50:49 +00:00
Janis Danisevskis
381ce9a86a Merge "Keymint: Add CERTIFICATE_* tags" am: ead6cd16d8 am: 864b71f5ff
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1566355

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I136bacafb14b28ed54e9f8f1cc6148ee7fb67aeb
2021-02-08 17:47:26 +00:00
Janis Danisevskis
864b71f5ff Merge "Keymint: Add CERTIFICATE_* tags" am: ead6cd16d8
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1566355

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibb299a56e9021c33e0029473f091bb120450db15
2021-02-08 17:26:53 +00:00
Janis Danisevskis
ead6cd16d8 Merge "Keymint: Add CERTIFICATE_* tags" 2021-02-08 16:52:16 +00:00