Commit graph

5608 commits

Author SHA1 Message Date
Paul Crowley
43972e7d10 Merge "Add MAX_BOOT_LEVEL tag, BOOT_LEVEL_EXCEEDED error" 2021-02-27 05:05:50 +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
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
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
David Li
79f27ce9dd Merge "add audio.usbv2.default linking libtinyalsav2 and libalsautilsv2" am: bd8ee49f8b am: b956508fa6 am: 350d586116
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1566240

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic9632f86ac1e5b8cbf16e28e2ecc36b7ae013315
2021-02-03 02:56:34 +00:00
David Li
350d586116 Merge "add audio.usbv2.default linking libtinyalsav2 and libalsautilsv2" am: bd8ee49f8b am: b956508fa6
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1566240

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I47f783fb6c21ba7610314dd9809472f5c393205a
2021-02-03 02:18:13 +00:00
David Li
b956508fa6 Merge "add audio.usbv2.default linking libtinyalsav2 and libalsautilsv2" am: bd8ee49f8b
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1566240

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I689db4fd3cc57044fea5b5d8bb988bb6ff5ce6ae
2021-02-03 01:33:25 +00:00
David Li
bd8ee49f8b Merge "add audio.usbv2.default linking libtinyalsav2 and libalsautilsv2" 2021-02-03 01:08:57 +00:00
Janis Danisevskis
06cd71d88a Keymint: Add CERTIFICATE_* tags
Add CERTIFICATE_NOT_BEFORE/AFTER and change CERTIFICATE_SERIAL to bignum
type.

Test: N/A
Change-Id: I5b1ed20a9babe8425e98a03637cdc14be842872c
2021-01-31 22:08:17 -08:00
David Li
98b3be0068 add audio.usbv2.default linking libtinyalsav2 and libalsautilsv2
Test: mm audio.usb.default audio.usbv2.default
Bug: 134958010
Change-Id: I2664a7461afaed6f71d58d730c7b8d5463240653
2021-02-01 05:33:03 +00:00
Andy Hung
34c2324d54 [automerger skipped] Merge "audio: add implementation for TV related API" am: 541a8d3e5b am: 4ca7eb33b5 am: 1deb60ae69 -s ours
am skip reason: Change-Id Id89dd151797723dbb58a44db48ff05bff3f20e04 with SHA-1 a205b6afac is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6221f46fa489b3fb28dbf3cd440f182a976c15dc
2021-01-28 20:43:09 +00:00
Andy Hung
1deb60ae69 Merge "audio: add implementation for TV related API" am: 541a8d3e5b am: 4ca7eb33b5
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1562805

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6a25ba11ea7bc9321a52de91f3efe94544cf872c
2021-01-28 18:33:50 +00:00
Andy Hung
4ca7eb33b5 Merge "audio: add implementation for TV related API" am: 541a8d3e5b
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1562805

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1e1940b2690d789adb892cf465c80fbe79583031
2021-01-28 18:20:34 +00:00
Andy Hung
541a8d3e5b Merge "audio: add implementation for TV related API" 2021-01-28 18:03:34 +00:00
Kuowei Li
96374df243 audio: add implementation for TV related API
1. AudioDescriptionMixLevel getter/setter.
2. DualMonoMode getter/setter.
3. PlaybackRate getter/setter.

Test: TIS player with instrumented HAL
Test: atest AudioTrackTest#testTunerConfiguration
Test: atest AudioTrackTest#testDualMonoMode
Test: atest AudioTrackTest#testAudioDescriptionMixLevel
Test: atest AudioManagerTest#testGetAdditionalOutputDeviceDelay
Bug: 173482792
Merged-In: Id89dd151797723dbb58a44db48ff05bff3f20e04
Change-Id: Id89dd151797723dbb58a44db48ff05bff3f20e04
2021-01-27 19:24:54 -08:00
Treehugger Robot
a38937fb41 Merge "Add limited use key tag defination." am: 3cd53f9f9d am: 15ff37860e am: d09416063a
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1538759

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id4adf74fc46cb200ff917202148325180380680e
2021-01-27 07:58:27 +00:00
David Zeuthen
45b6ee745a Merge "Add KM_PURPOSE_AGREE_KEY constant." am: 203813672e am: 4f136a5659 am: 1fa7495b89
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1556301

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5d8a778dd90b93a2b74c13f475c1b34f241e76c2
2021-01-27 07:57:55 +00:00
Treehugger Robot
d09416063a Merge "Add limited use key tag defination." am: 3cd53f9f9d am: 15ff37860e
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1538759

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I99d21d04c4593533f8cd97704ec2486fef16bd76
2021-01-26 23:40:57 +00:00
Treehugger Robot
15ff37860e Merge "Add limited use key tag defination." am: 3cd53f9f9d
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1538759

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifc5e42d48094e0ba4e8f46218f4ee25456d072af
2021-01-26 23:27:54 +00:00
David Zeuthen
1fa7495b89 Merge "Add KM_PURPOSE_AGREE_KEY constant." am: 203813672e am: 4f136a5659
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1556301

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6a7edf8d299a04dd864b6fc2f7a6a8505d00d39f
2021-01-26 23:12:51 +00:00
Treehugger Robot
3cd53f9f9d Merge "Add limited use key tag defination." 2021-01-26 23:05:51 +00:00
David Zeuthen
4f136a5659 Merge "Add KM_PURPOSE_AGREE_KEY constant." am: 203813672e
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1556301

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I44156928417a3288a6b2fdcf21604b6bca8eeafd
2021-01-26 22:26:41 +00:00
David Zeuthen
203813672e Merge "Add KM_PURPOSE_AGREE_KEY constant." 2021-01-26 22:05:24 +00:00
David Zeuthen
3107e47dfc Add KM_PURPOSE_AGREE_KEY constant.
Test: VtsAidlKeyMintTargetTest
Bug: 171847641
Change-Id: I9e3128652767509911445491248c01953359cb67
2021-01-25 13:23:51 -05:00
Kuowei Li
a205b6afac audio: add implementation for TV related API
1. AudioDescriptionMixLevel getter/setter.
2. DualMonoMode getter/setter.
3. PlaybackRate getter/setter.

Test: TIS player with instrumented HAL
Test: atest AudioTrackTest#testTunerConfiguration
Test: atest AudioTrackTest#testDualMonoMode
Test: atest AudioTrackTest#testAudioDescriptionMixLevel
Test: atest AudioManagerTest#testGetAdditionalOutputDeviceDelay
Bug: 173482792
Change-Id: Id89dd151797723dbb58a44db48ff05bff3f20e04
2021-01-14 13:01:57 -08:00
jiabin
a635fcfa6a Upgrade legacy usb HAL to version 3.2.
Upgrading legacy usb HAL to version 3.2 and implementing
get_audio_port_v7. The API get_audio_port_v7 returns the device
capabilites with supported formats and corresponding supported
channel masks and sample rates for the formats.

Bug: 160352965
Test: manually
Test: VTS with adding usb as attached devices.
Change-Id: I90a2b2706aa2b385210fb4922e4287f9f0ff9d6c
2021-01-13 22:25:51 +00:00
Qi Wu
ba765a66c1 Add limited use key tag defination.
Test: none
Change-Id: I5464f6411b8bce94a3736cd033d064e75d313fe1
2021-01-13 22:37:19 +08:00
Treehugger Robot
50533061dd [automerger skipped] Merge "audio HAL: new track metadata version" am: 29ae34bcde am: cdfe32fd8a am: 862a13078d -s ours
am skip reason: Change-Id I30cc3d35f97bb1bc5f80983f6ae85f3e820bf414 with SHA-1 2e8b8a906d is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5a4e80ef8b8ef700522845255232d99667b93d12
2021-01-07 23:20:15 +00:00
Treehugger Robot
862a13078d Merge "audio HAL: new track metadata version" am: 29ae34bcde am: cdfe32fd8a
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1540995

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I30052378a978c2aa47c0a43778f20b01cda566e5
2021-01-07 22:52:58 +00:00
Treehugger Robot
cdfe32fd8a Merge "audio HAL: new track metadata version" am: 29ae34bcde
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1540995

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I265c473032e6452baf7cc65a55352d8c0e005b5d
2021-01-07 22:07:02 +00:00
Treehugger Robot
29ae34bcde Merge "audio HAL: new track metadata version" 2021-01-07 21:52:07 +00:00
Eric Laurent
bc512ab977 audio HAL: new track metadata version
Add channel mask and audio attributes tags to playback
and record track metadata sent to audio HAL.
Add new HAL methods and structs for use with HALs version 3.2
and above to provide backwards compatibility with old HALs.

Bug: 168751366
Test: make
Change-Id: I30cc3d35f97bb1bc5f80983f6ae85f3e820bf414
Merged-In: I30cc3d35f97bb1bc5f80983f6ae85f3e820bf414
2021-01-05 12:50:59 -08:00
David Zeuthen
a647a1dfa2 Merge "Add libhardware support for RSA OAEP MGF1." am: 1de976f07b am: ee427986d8 am: 482268110b
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1533863

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0fd84e5926fdf63cea6a3501266e8502cd3c8dbb
2021-01-05 18:00:39 +00:00
David Zeuthen
482268110b Merge "Add libhardware support for RSA OAEP MGF1." am: 1de976f07b am: ee427986d8
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1533863

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9553d2f4e2749b8f3acea9c71295bf9a34c5ebed
2021-01-05 17:23:50 +00:00
David Zeuthen
ee427986d8 Merge "Add libhardware support for RSA OAEP MGF1." am: 1de976f07b
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1533863

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I03baee6348ebf1964c42e4a4eef4647d8cd26a5d
2021-01-05 16:51:41 +00:00