Commit graph

26877 commits

Author SHA1 Message Date
Kalesh Singh
34277b9a6b Merge "Revert "Memtrack HAL: Add stable AIDL implementation"" am: b2a38b62b5
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1530887

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibea84b7d89297e09a04cc1e008bfa5c41c458103
2020-12-16 01:05:13 +00:00
Kalesh Singh
b2a38b62b5 Merge "Revert "Memtrack HAL: Add stable AIDL implementation"" 2020-12-16 00:48:06 +00:00
Kalesh Singh
28641ffb08 Revert "Memtrack HAL: Add stable AIDL implementation"
Revert "libmemtrack: Add support for AIDL memtrack HAL"

Revert "Add stable aidl memtrack HAL to product packages"

Revert "Add stable aidl memtrack hal to vndk list"

Revert "Memtrack HAL stable aidl sepolicy"

Revert "Add android.hardware.memtrack-unstable-ndk_platform"

Revert submission 1518702-memtrack-aidl

Reason for revert: Broken tests and boot time regressions
Reverted Changes:
Ic4dd70e2c:Add android.hardware.memtrack-unstable-ndk_platfor...
Iaf99d0ca4:Add stable aidl memtrack HAL to product packages
Iac54ae2ba:Add stable aidl memtrack hal to vndk list
If310210a3:libmemtrack: Add support for AIDL memtrack HAL
Ib6c634def:Memtrack HAL: Add stable AIDL implementation
I5e1d0e006:Memtrack HAL stable aidl sepolicy

Change-Id: I4a9e3522afe9e9189b7eddc9520d5ef2e2b74520
2020-12-16 00:19:38 +00:00
Steven Moreland
32f937623c support lib for libcutils<->NDK AIDL handle am: 74e043ba2d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1528750

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib1afc2964856efcb4f2121a0943771313a03b7a0
2020-12-15 17:00:22 +00:00
Treehugger Robot
8e4e5639c9 Merge "Use safe_union correctly" am: baf61434fd
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1510995

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I89dac63df8547d9609a547cc8081de374505f4eb
2020-12-15 16:59:38 +00:00
Steven Moreland
74e043ba2d support lib for libcutils<->NDK AIDL handle
The native_handle API is notoriously tricky to work with, and this is
expected to be very common. So, adding a small helper library.

Fixes: 175432703
Test: atest libaidlcommonsupport_test
Change-Id: I4a00d2b14fefe6c979ee656e353e117661a1a483
2020-12-15 16:45:20 +00:00
Treehugger Robot
baf61434fd Merge "Use safe_union correctly" 2020-12-15 16:30:44 +00:00
Thiébaud Weksteen
3196c429e0 Merge "Add getAllowedNetworkTypesBitmap HAL API" am: a07d055654
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1526541

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I19bcdf6899fa5929e2d5e90ec16c5de42e669334
2020-12-15 15:50:52 +00:00
Thiébaud Weksteen
a07d055654 Merge "Add getAllowedNetworkTypesBitmap HAL API" 2020-12-15 12:39:51 +00:00
Grzegorz Kołodziejczyk
0f0c5d17d2 Use safe_union correctly
As described in source.android.com/devices/architecture/hidl/safe_union
value must be assigned through generated getter, rather than assigning it directly.

Test: vts-tradefed run vts -m VtsHalBluetoothAudioV2_1TargetTest
Sponsor: jpawlowski@
Bug: 150670922
Change-Id: Iefc7ee98163ec2b3387fc01c3d69c1dcd15e94bc
2020-12-15 11:08:16 +00:00
Treehugger Robot
be07fd2de6 Merge "Memtrack HAL: Add stable AIDL implementation" am: e5d68ba29c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1518666

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ida1cbb3f3533182814b867660e25c8b3d0f67089
2020-12-14 19:29:18 +00:00
Treehugger Robot
e5d68ba29c Merge "Memtrack HAL: Add stable AIDL implementation" 2020-12-14 18:36:10 +00:00
Treehugger Robot
61d27ba878 Merge "Remove authorization set serialization." am: 4d13d0027c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1520081

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I387ad00c35d8fd9ccba7e7eae3d2128f44cfa7de
2020-12-14 14:50:00 +00:00
Treehugger Robot
482d670ff6 Merge "Move tag type comments where they belong." am: dd9d98c339
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1520080

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I00227cd2c0119c8f290d71eec04931b9d77895e5
2020-12-14 14:49:50 +00:00
Treehugger Robot
5684571ed3 Merge "Various cleanups" am: 5fb746bc9f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1522457

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia2d8b8d72716aa0e25480f2bbb842d53f13578f2
2020-12-14 14:48:46 +00:00
Treehugger Robot
4d13d0027c Merge "Remove authorization set serialization." 2020-12-14 14:30:52 +00:00
Treehugger Robot
dd9d98c339 Merge "Move tag type comments where they belong." 2020-12-14 14:30:15 +00:00
Treehugger Robot
5fb746bc9f Merge "Various cleanups" 2020-12-14 14:30:10 +00:00
Treehugger Robot
14e3969067 Merge changes from topic "aosp-default-wrapper" am: 6c1dd66442
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1526845

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9d3825f29120e38398d4343f4b9d469438a63f7a
2020-12-14 09:28:03 +00:00
Mikhail Naganov
117af81896 Implement a.h.audio.common@7.0-util module am: 1b444a5332
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1526844

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1a6e957ad7772bc3b91e13ead896d5ff16dd798a
2020-12-14 09:28:00 +00:00
Mikhail Naganov
1183e86887 Move UUID conversions into their own class am: 4122f6328a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1526843

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3e1e91851ea559855720a178bbe75df8ae4d8f60
2020-12-14 09:27:07 +00:00
Treehugger Robot
6c1dd66442 Merge changes from topic "aosp-default-wrapper"
* changes:
  audio: Use docstrings instead of comments in types.hal files
  Implement a.h.audio.common@7.0-util module
  Move UUID conversions into their own class
2020-12-14 08:55:22 +00:00
Amit Mahajan
131389f6ab Merge "Receive forwarded number from Modem" am: d35457c922
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/813457

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib042e9210a197382a926b2c38e325f9cc6dad957
2020-12-14 08:05:09 +00:00
Amit Mahajan
d35457c922 Merge "Receive forwarded number from Modem" 2020-12-14 07:48:41 +00:00
Shawn Willden
747eeaea28 Remove authorization set serialization.
This is no longer needed in KeyMint. Keystore2 implements similar
functionality in Rust.

Test: Build
Change-Id: Ia43716449756935619fb22ef5aba113e420c2687
2020-12-13 23:48:10 -07:00
Shawn Willden
09b5826c68 Move tag type comments where they belong.
Because AIDL doesn't allow tag values to be constructed the way we
did in HIDL (and before), each tag definition carries a comment
specifying what the "magic" tag type value used in its construction
means.  This CL moves those comments so they're adjacent to the value
they're documenting.

Test: Build
Change-Id: I30b037f9ddf6bf2b07326a53959d490e045c891a
2020-12-13 23:48:10 -07:00
Shawn Willden
1d3f85e891 Various cleanups
Mostly just removal of old-style #include guards in favor of #pragm
once, reorganization of header includes, correction of copyright
years, etc.

Test: VtsAidlKeyMintTargetTest
Change-Id: I070584ecec550a2f133b1c19f36f99e7b5544e7c
2020-12-13 23:48:10 -07:00
Shawn Willden
dbd149504f Revert^2 "Move keymint to android.hardware.security." am: 08a7e43e78
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1525190

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icf583a13e67e08e7d1d812544a3cdaa165d4ad3a
2020-12-12 00:26:10 +00:00
Mikhail Naganov
ec5df2d747 audio: Use docstrings instead of comments in types.hal files
Converted comments into docstrings for enums and structures
in Audio HAL V7 definition.

Bug: 142480271
Test: m
Change-Id: Id5e36e7a42e2600ab69612819f8260110871c711
Merged-In: Id5e36e7a42e2600ab69612819f8260110871c711
2020-12-11 22:10:50 +00:00
Mikhail Naganov
1b444a5332 Implement a.h.audio.common@7.0-util module
This includes a rewrite of HidlUtils for V7.
A unit test is added for its conversion functions.

Made necessary minor adjustments to the HAL V7 types.
Also, fixed definition of 'audioFormatsList' to allow for
vendor extensions.

Bug: 142480271
Bug: 173647783
Test: m && atest android.hardware.audio.common@7.0-util_tests
Change-Id: Ib883f1c246fce78c004846516699aa724d4b5d44
Merged-In: Ib883f1c246fce78c004846516699aa724d4b5d44
2020-12-11 22:10:10 +00:00
Mikhail Naganov
4122f6328a Move UUID conversions into their own class
Mechanical extraction of HidlUtils::uuidFrom/ToHal into
a dedicated class UuidUtils.

Bug: 142480271
Test: m
Change-Id: Ic5333ba32dc293f32c5562d0ef05bde8e5f9b302
Merged-In: Ic5333ba32dc293f32c5562d0ef05bde8e5f9b302
2020-12-11 22:09:43 +00:00
Yomna Nasser
e8bfa9c4e1 Add getAllowedNetworkTypesBitmap HAL API
Adds corresponding query API getAllowedNetworkTypesBitmap to
existing setAllowedNetworkTypeBitmap.

Test: atest
Bug: 171791177
Change-Id: Ib8f0075dda41d4876a14f7223a067e34626a4675
Merged-In: Ib8f0075dda41d4876a14f7223a067e34626a4675
2020-12-11 21:18:31 +00:00
Shawn Willden
08a7e43e78 Revert^2 "Move keymint to android.hardware.security."
1ffcdebadd

Bug: 175345910
Bug: 171429297
Exempt-From-Owner-Approval: re-landing topic with no changes in this CL.
Change-Id: I691cad252f188b54a8076589d9955774d74d4729
2020-12-11 20:36:59 +00:00
Orion Hodson
fdc32ed322 Merge "Revert "Move keymint to android.hardware.security."" am: 495ceb90fd
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1525806

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iff93d3ee047dc5dc5584d944e1e9a0a3d639cbc8
2020-12-11 12:51:16 +00:00
Orion Hodson
495ceb90fd Merge "Revert "Move keymint to android.hardware.security."" 2020-12-11 12:29:46 +00:00
Orion Hodson
1ffcdebadd Revert "Move keymint to android.hardware.security."
Revert "Keystore 2.0 SPI: Move keymint spec to security namespace."

Revert "Keystore 2.0: Move keymint spec to security namespace."

Revert "Keystore 2.0: Move keymint spec to security namespace."

Revert "Move keymint to android.hardware.security."

Revert "Configure CF to start KeyMint service by default."

Revert "Move keymint to android.hardware.security."

Revert "Move keymint to android.hardware.security."

Revert submission 1522123-move_keymint

Reason for revert: Build breakage
Bug: 175345910
Bug: 171429297
Reverted Changes:
Ief0e9884a:Keystore 2.0: Move keymint spec to security namesp...
Idb54e8846:Keystore 2.0: Move keymint spec to security namesp...
I9f70db0e4:Remove references to keymint1
I2b4ce3349:Keystore 2.0 SPI: Move keymint spec to security na...
I2498073aa:Move keymint to android.hardware.security.
I098711e7d:Move keymint to android.hardware.security.
I3ec8d70fe:Configure CF to start KeyMint service by default.
Icbb373c50:Move keymint to android.hardware.security.
I86bccf40e:Move keymint to android.hardware.security.

Change-Id: I160cae568ed6b15698bd0af0b19c6c949528762d
2020-12-11 10:45:43 +00:00
Treehugger Robot
962bd5be93 Merge changes from topic "aosp-audio-base-h" am: f3ff53da1a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1522145

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I892a5901dbbbc500c0f213c12eded4996ade8ffc
2020-12-10 23:23:37 +00:00
Mikhail Naganov
19dae82311 Make audio*-base.h files autogenerated again am: 2287a249a6
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1522144

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I18554b1e063b25306de2bfa9c22460304022d9b8
2020-12-10 23:22:50 +00:00
Shawn Willden
640d1c8a40 Merge "Move keymint to android.hardware.security." am: 0a89757936
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1519122

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If245d36a260deff9d2b98add6b114a2afac7353a
2020-12-10 23:17:32 +00:00
Treehugger Robot
f3ff53da1a Merge changes from topic "aosp-audio-base-h"
* changes:
  audio: Add @export annotations to microphone-related enums
  Make audio*-base.h files autogenerated again
2020-12-10 22:57:35 +00:00
Shawn Willden
0a89757936 Merge "Move keymint to android.hardware.security." 2020-12-10 22:49:14 +00:00
Kalesh Singh
f4ab018143 Memtrack HAL: Add stable AIDL implementation
Bug: 175021432
Test: adb shell dumpsys -l | grep android.hardware.memtrack.IMemtrack
Test: VtsHalMemtrackTargetTest
Change-Id: Ib6c634def4eeca62b0b2615dc7dc273183cda2b1
2020-12-10 10:10:19 -05:00
Roman Kiryanov
9da9beb860 Merge "(reland) Link libqemu_pipe into a.h.a.vehicle@2.0-default-impl-lib" am: 46ca02f425
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1522197

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I027a0ebc4593cc537cccf6e901589f5735f8e13b
2020-12-10 04:35:49 +00:00
Roman Kiryanov
46ca02f425 Merge "(reland) Link libqemu_pipe into a.h.a.vehicle@2.0-default-impl-lib" 2020-12-10 04:15:58 +00:00
Xin Li
145c97fbaf [automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: abf2b89f2d -s ours
am skip reason: Change-Id I3392a718ae479ff09d42c49c4c9a5e1c2eb6c81a with SHA-1 2bb38c61f0 is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1521166

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I871f46f45f88deddc7d29eb7fbc0fbf02fc52f66
2020-12-10 03:05:45 +00:00
Xin Li
abf2b89f2d DO NOT MERGE - Merge Android R QPR1
Bug: 172690556
Merged-In: I3392a718ae479ff09d42c49c4c9a5e1c2eb6c81a
Change-Id: I15884712eecc60ed20710b907e3b93f209a51875
2020-12-09 17:44:05 -08:00
Mikhail Naganov
37d78b45e7 audio: Add @export annotations to microphone-related enums
This addresses long-standing TODOs in system/audio.h.
Annotated the following enums:

 - AudioMicrophoneChannelMapping;
 - AudioMicrophoneLocation;
 - AudioMicrophoneDirectionality.

This allows removing hand-written conversion functions
since the values are guaranteed to match between HIDL and
system/audio.h.

Bug: 122858783
Test: m
Change-Id: I2bf250ef9154a7ae86679afa566c80dfd01f1d5b
Merged-In: I2bf250ef9154a7ae86679afa566c80dfd01f1d5b
2020-12-09 23:37:48 +00:00
Mikhail Naganov
2287a249a6 Make audio*-base.h files autogenerated again
Major change: audio-base.h is generated from "core" types.hal,
new file audio_common-base.h is generated from "common" types.hal.

In order to be able to add system-only constants to generated
enums, the latter are made anonymous, values got "HAL_" prefix.
Then in system/audio.h a full enum is constructed.

Removed audio_drain_type_t from exported, as it belongs to
libhardware only.

Added missing enums that were introduced at the system side
only in Android R.

Bug: 122858783
Test: m
Change-Id: I8c017912395a03beacea077fd562fae2329ad975
Merged-In: I8c017912395a03beacea077fd562fae2329ad975
2020-12-09 23:36:48 +00:00
Shawn Willden
f73e952ea4 Move keymint to android.hardware.security.
Test: VtsAidlKeyMintTargetTest
Change-Id: I2498073aa834584229e9a4955a97f279a94d1dd5
2020-12-09 16:26:41 -07:00
Steven Moreland
2bb38c61f0 Merge "Remove ignored annotations." am: 8523de7588
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1519066

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3392a718ae479ff09d42c49c4c9a5e1c2eb6c81a
2020-12-09 20:52:46 +00:00