Commit Graph

27064 Commits

Author SHA1 Message Date
Thiébaud Weksteen
9f0ca6fac5 Merge "Add getAllowedNetworkTypesBitmap HAL API" am: a07d055654 am: 3196c429e0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1526541

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7ce4ed340cb791ed5e8c0eb5d87eaa0de09af013
2020-12-15 16:15:51 +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
Treehugger Robot
8f356a5035 Merge "Memtrack HAL: Add stable AIDL implementation" am: e5d68ba29c am: be07fd2de6
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1518666

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9c17a00485554becde5863be2b6cb0a0d337b850
2020-12-14 19:52:37 +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
f90da60cc6 Merge "Remove authorization set serialization." am: 4d13d0027c am: 61d27ba878
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1520081

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I12f34f8ab58ccdb135fff6451ba2a948ab660ad7
2020-12-14 15:47:29 +00:00
Treehugger Robot
4cbf9772c8 Merge "Various cleanups" am: 5fb746bc9f am: 5684571ed3
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1522457

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I011bd57c095507cf1e5e8c3e3853a0a1062de090
2020-12-14 15:46:53 +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
01d8352de2 Merge changes from topic "aosp-default-wrapper" am: 6c1dd66442 am: 14e3969067
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1526845

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I06119c38489e3a638872b734b9c2c978f5383cad
2020-12-14 09:43:26 +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
efe5ac8aa4 Merge "Receive forwarded number from Modem" am: d35457c922 am: 131389f6ab
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/813457

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id59e0b5c8a2863218b08edb0a743c21b7da5579e
2020-12-14 08:21:16 +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
5b8443fb65 Revert^2 "Move keymint to android.hardware.security." am: 08a7e43e78 am: dbd149504f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1525190

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I05ab743bf2e0f0be39e93591c0832c8cc9116931
2020-12-12 00:49:57 +00: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
e0a4966342 Merge "Revert "Move keymint to android.hardware.security."" am: 495ceb90fd am: fdc32ed322
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1525806

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I466a533429cfa32372a2be3e885ec53339eb999c
2020-12-11 13:31:38 +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
Changyeon Jo
0e9bb861a7 Correct EVS VTS test case am: cf0e945ac2
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13195161

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I10f92fa6fe76da15f9093d23a71d9c7456db5b10
2020-12-10 23:49:39 +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
80ab19e2c4 Merge "(reland) Link libqemu_pipe into a.h.a.vehicle@2.0-default-impl-lib" am: 46ca02f425 am: 9da9beb860
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1522197

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id6945f7d43e067a52a6d5a1da4d2cd0ce6eec288
2020-12-10 05:01:14 +00:00