Treehugger Robot
4e59bf430c
Merge "Various cleanups" am: 5fb746bc9f am: 5684571ed3 am: 4cbf9772c8
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1522457
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I824d28adf2ffecadf6e4ad2629c00c09f7681191
2020-12-14 16:01:49 +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
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
5fb746bc9f
Merge "Various cleanups"
2020-12-14 14:30:10 +00:00
Treehugger Robot
d189dcb77a
[automerger skipped] Merge changes from topic "aosp-default-wrapper" am: 6c1dd66442 am: 14e3969067 am: 01d8352de2 -s ours
...
am skip reason: Change-Id Id5e36e7a42e2600ab69612819f8260110871c711 with SHA-1 8e85d1f5a5 is in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1526845
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I64242dee604d72765fe1364dad851611123c0042
2020-12-14 10:19:08 +00:00
Mikhail Naganov
2f27bf1895
[automerger skipped] Implement a.h.audio.common@7.0-util module am: 1b444a5332 am: 117af81896 am: 222368f33b -s ours
...
am skip reason: Change-Id Ib883f1c246fce78c004846516699aa724d4b5d44 with SHA-1 5b8a144d8c is in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1526844
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibf4409ba2acd63cc8becaaf8c02e41cb11e7599f
2020-12-14 10:19:07 +00:00
Mikhail Naganov
4922a5e5d6
[automerger skipped] Move UUID conversions into their own class am: 4122f6328a am: 1183e86887 am: dac7bf0e72 -s ours
...
am skip reason: Change-Id Ic5333ba32dc293f32c5562d0ef05bde8e5f9b302 with SHA-1 95e4fe64de is in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1526843
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iac49846ccb671851f0f4f86ee1aa7a8c59d71e31
2020-12-14 10:19:04 +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
0ca7a795c4
Merge "Receive forwarded number from Modem" am: d35457c922 am: 131389f6ab am: efe5ac8aa4
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/813457
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4a4f04086ff23fbd95aeb0a7b274f84737d549c7
2020-12-14 08:52:56 +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
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
Jimmy Chen
ed0d49d277
Merge "hostapd: add 60GHz(WiGig) support"
2020-12-12 04:26:03 +00:00
Shawn Willden
3c1c203105
Revert^2 "Move keymint to android.hardware.security." am: 08a7e43e78 am: dbd149504f am: 5b8443fb65
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1525190
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0181729ff6b700b05983d48f10bbe5299426db85
2020-12-12 01:07:06 +00: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
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
0dc2d4a695
Merge "Revert "Move keymint to android.hardware.security."" am: 495ceb90fd am: fdc32ed322 am: e0a4966342
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1525806
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icc28b0d25485ada9d78d2732ee742c4e5195ace4
2020-12-11 14:02:27 +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
Changyeon Jo
a1bd1c9690
Correct EVS VTS test case am: cf0e945ac2 am: 0e9bb861a7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13195161
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7cb8308ecf866e4ec5046d17b697b119573c35d7
2020-12-11 11:07:37 +00:00
Treehugger Robot
feb8908fb0
[automerger skipped] Merge changes from topic "aosp-audio-base-h" am: f3ff53da1a am: 962bd5be93 am: ff99be2e34 -s ours
...
am skip reason: Change-Id I2bf250ef9154a7ae86679afa566c80dfd01f1d5b with SHA-1 9d9f970ee4 is in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1522145
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic433846b3ab5bac27814a3dfef0305e48f70a497
2020-12-11 11:07:21 +00:00
Mikhail Naganov
760227c5e3
[automerger skipped] Make audio*-base.h files autogenerated again am: 2287a249a6 am: 19dae82311 am: 9b93d31ba7 -s ours
...
am skip reason: Change-Id I8c017912395a03beacea077fd562fae2329ad975 with SHA-1 a5273c760c is in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1522144
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I76197be3dec8237e4e734fba8f6b100cac41775f
2020-12-11 11:07:19 +00:00
Shawn Willden
78a9a6c37a
Merge "Move keymint to android.hardware.security." am: 0a89757936 am: 640d1c8a40 am: 5a1001361d
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1519122
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I60faca04b21a15a3a30d1a0f1d1022363e5f9ace
2020-12-11 11:01:04 +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
Eric Laurent
68d0c71b5b
Merge "audio HAL: add output flag indicating support for gapless transitions"
2020-12-11 07:09:29 +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
Hayden Gomes
5ac252bafc
Merge "Use enumerator for AudioFocusChange"
2020-12-10 20:37:59 +00:00
Yomna Nasser
a1a42d767a
Merge "Add getAllowedNetworkTypesBitmap HAL API"
2020-12-10 16:52:02 +00:00
TreeHugger Robot
b33cad6087
Merge "Add SEAT_OCCUPANCY property into google VHAL"
2020-12-10 07:45:22 +00:00
Roman Kiryanov
1e80aa1ace
Merge "(reland) Link libqemu_pipe into a.h.a.vehicle@2.0-default-impl-lib" am: 46ca02f425 am: 9da9beb860 am: 80ab19e2c4
...
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1522197
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I02c005ba57c51c205a4460569dc7ba0dcea50b40
2020-12-10 05:18:23 +00:00