Commit Graph

45726 Commits

Author SHA1 Message Date
Treehugger Robot
8ea503d264 Merge "Make BootControlHAL available in recovery" am: 22b8aceacb am: ed55640f92 am: dee7a62c25 am: 5f75771a9e am: b65c30dc13
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2198783

Change-Id: Id009e4f77062db432b59e78cb44cef4df5bf92df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-02 22:57:39 +00:00
Treehugger Robot
b65c30dc13 Merge "Make BootControlHAL available in recovery" am: 22b8aceacb am: ed55640f92 am: dee7a62c25 am: 5f75771a9e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2198783

Change-Id: Ie56e38f65bd6cef72d4d9d7ff634d4616ad8a07a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-02 22:02:44 +00:00
Treehugger Robot
5f75771a9e Merge "Make BootControlHAL available in recovery" am: 22b8aceacb am: ed55640f92 am: dee7a62c25
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2198783

Change-Id: I5a7858fcf3bad9ea1f9c5265300b779b322aff36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-02 21:35:51 +00:00
Treehugger Robot
51478a8afc Merge "fix segmentation fault of GraphicsComposerAidlCommandTest" am: 9cf5a87265 am: 2a2ce43e66 am: b515796c3f am: 5555447a70 am: ef44568cfe
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2198035

Change-Id: I588d63a6a02a2bcf8a42b811926d68453c25c9f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-02 21:23:16 +00:00
Treehugger Robot
dee7a62c25 Merge "Make BootControlHAL available in recovery" am: 22b8aceacb am: ed55640f92
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2198783

Change-Id: Id9945efa04822029d0fca0960f12bb31d919d394
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-02 21:08:37 +00:00
Treehugger Robot
ef44568cfe Merge "fix segmentation fault of GraphicsComposerAidlCommandTest" am: 9cf5a87265 am: 2a2ce43e66 am: b515796c3f am: 5555447a70
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2198035

Change-Id: Id132f9d8e62f8e535c4fe0bda775195c009dcfd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-02 20:39:24 +00:00
Treehugger Robot
ed55640f92 Merge "Make BootControlHAL available in recovery" am: 22b8aceacb
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2198783

Change-Id: I92aeb1fbaa02233c06325cf3396f75beb6cfe908
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-02 20:09:24 +00:00
Treehugger Robot
5555447a70 Merge "fix segmentation fault of GraphicsComposerAidlCommandTest" am: 9cf5a87265 am: 2a2ce43e66 am: b515796c3f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2198035

Change-Id: I237edc25faf61897f40fd48bc87ea39bf3a0119a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-02 19:28:00 +00:00
Treehugger Robot
22b8aceacb Merge "Make BootControlHAL available in recovery" 2022-09-02 19:25:29 +00:00
David Drysdale
2f226ec861 Merge changes Iaa941e12,Icbd4c9cd am: 2530f9ca5e am: b361a6f5f4 am: 4fb9896a78 am: 775b4cb559 am: 04502b445d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2203576

Change-Id: Idbd7e6fd41f7aa3f380a3b4ab91014bc79bd5bc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-02 18:40:50 +00:00
Sally Qi
21afa37697 Merge "Add cc_defaults wrapper for android.hardware.graphics.allocator ndk package." 2022-09-02 18:32:17 +00:00
Treehugger Robot
b515796c3f Merge "fix segmentation fault of GraphicsComposerAidlCommandTest" am: 9cf5a87265 am: 2a2ce43e66
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2198035

Change-Id: I8414a7ce45ca19eeb2beb87283d7c77dba84f336
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-02 18:19:09 +00:00
David Drysdale
04502b445d Merge changes Iaa941e12,Icbd4c9cd am: 2530f9ca5e am: b361a6f5f4 am: 4fb9896a78 am: 775b4cb559
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2203576

Change-Id: I0703a699461450d0d12348e75d51b7f4e3f726cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-02 17:56:20 +00:00
Treehugger Robot
2a2ce43e66 Merge "fix segmentation fault of GraphicsComposerAidlCommandTest" am: 9cf5a87265
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2198035

Change-Id: Ieaf28f3ab3ff72fb3ad11804986f501b8408170f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-02 17:41:08 +00:00
David Drysdale
775b4cb559 Merge changes Iaa941e12,Icbd4c9cd am: 2530f9ca5e am: b361a6f5f4 am: 4fb9896a78
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2203576

Change-Id: I760191b6909d98a695eafc25b2d6a3dbaa977353
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-02 17:29:18 +00:00
Treehugger Robot
9cf5a87265 Merge "fix segmentation fault of GraphicsComposerAidlCommandTest" 2022-09-02 17:12:02 +00:00
David Drysdale
4fb9896a78 Merge changes Iaa941e12,Icbd4c9cd am: 2530f9ca5e am: b361a6f5f4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2203576

Change-Id: Ica5c6e96b7dd0c70077d56688d78d7a3c5d54fc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-02 17:01:31 +00:00
David Drysdale
b361a6f5f4 Merge changes Iaa941e12,Icbd4c9cd am: 2530f9ca5e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2203576

Change-Id: I84c2575e56894d1d7214b777723a77c4cff30ea5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-02 16:32:33 +00:00
David Drysdale
2530f9ca5e Merge changes Iaa941e12,Icbd4c9cd
* changes:
  KeyMint HAL: reinstate tags in extension schema
  KeyMint HAL: clarify obsolete tags
2022-09-02 16:09:43 +00:00
David Drysdale
7ea97a310a KeyMint HAL: reinstate tags in extension schema
Commit 93c72cef92 ("KeyMint: sync all attestation tags",
http://aosp/1719302) removed various tags from the attestation that are
only applicable to symmetric keys, on the assumption that these are
irrelevant for the attestation extension that is generated for the
certificate holding asymmetric public keys.

However, that change did not take into account the fact that the
AuthorizationList ASN.1 schema is re-used elsewhere in the KeyMint API,
specifically as a way of describing the characteristics associated with
a key that is being securely imported via
IKeyMintDevice::importWrappedKey.

That import process may be used for symmetrics keys, and so the tags
that are specific to symmetric keys still need to be included in
AuthorizationList.

Similarly, USER_SECURE_ID values are never included in attestation
extensions because they have no meaning off-device, but they may be
needed as part of the import of a wrapped key.

Test: TreeHugger, comment change only
Bug: 244693617
Change-Id: Iaa941e120e3641a6e6c369b7c6a51f10b44df78a
2022-09-02 17:08:04 +01:00
David Drysdale
4683a5383f KeyMint HAL: clarify obsolete tags
The tag enum names can't be removed due to AIDL back-compatibility
requirements, and also it's useful to have the values present to avoid
inadvertent reuse.

Update the tag comment text to indicate that these tags are obsolete.

Bug: 191738660
Test: TreeHugger, comment change only
Change-Id: Icbd4c9cd0313f93bc491b49eb9077766d0f44e34
2022-09-02 17:07:41 +01:00
Mikhail Naganov
951ad0e1f6 audio: Add checks to effects feature configs retrieval am: 8e3480edfe am: b5a665a326
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19806116

Change-Id: I0fd3688038a23a73d8f97417a174b0cfb25097bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 22:46:51 +00:00
Mikhail Naganov
b5a665a326 audio: Add checks to effects feature configs retrieval am: 8e3480edfe
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19806116

Change-Id: Ief00037cb4237b1a7d3f66fb6287f87e2e0761ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 22:17:06 +00:00
Shunkai Yao
1857920795 [automerger skipped] AIDL effect: Extract common parts of effect service into cc_defaults am: 43f9a07e04 am: acfc7ae9cb am: 4526d844d1 am: 39be76e891 am: 19a30e0200 -s ours
am skip reason: Merged-In I58d925b3f4a3d41d4014f54f78d95c26cc5520ea with SHA-1 c8ed5c27a1 is already in history

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

Change-Id: I39a9f31f458e0c739273bf3396a350a46ca871cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 21:40:14 +00:00
Shunkai Yao
c380427ce1 [automerger skipped] AIDL effect: Add vts for the initial effect AIDL interface implementation am: 67b1be60ab am: e0907cf5f2 am: 04428686b9 am: 2970bb4f43 am: 4d780e918c -s ours
am skip reason: Merged-In If5db3cae0447f41a149a60505d208070fbfedb7f with SHA-1 1f19c23ab6 is already in history

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

Change-Id: Ia77bbd8e093d19420b865093851e71d62536de2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 21:40:13 +00:00
Shunkai Yao
1e21ef69ae [automerger skipped] AIDL effect: Minimal example implementation am: c23916b96f am: 082f06b5f0 am: 00367c28e3 am: 6e8e2f1423 am: 0f7bf04540 -s ours
am skip reason: Merged-In I88266b509a03ee336e22be460580c5b22123659e with SHA-1 8a0ae5430f is already in history

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

Change-Id: I961a4c12e1ef76c02f3966d72e2681003b2a6f85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 21:40:11 +00:00
Shunkai Yao
845172b21e [automerger skipped] AIDL effect: Initial IFactory interface definition am: f1d6039f96 am: 2b69b4b29f am: ef34d62d01 am: 303a01a670 am: 1cce4bcd4b -s ours
am skip reason: Merged-In I9f5ef1284bb5d77a9d60cb8b901742fc8e467926 with SHA-1 d56bc22d1e is already in history

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

Change-Id: If0a5e5b9340e603157eb1965930a38e7342404dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 21:40:06 +00:00
Shunkai Yao
19a30e0200 AIDL effect: Extract common parts of effect service into cc_defaults am: 43f9a07e04 am: acfc7ae9cb am: 4526d844d1 am: 39be76e891
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2198794

Change-Id: I5756aa9ff46e18899d3b29211101f48d2f1968b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 21:16:24 +00:00
Shunkai Yao
4d780e918c AIDL effect: Add vts for the initial effect AIDL interface implementation am: 67b1be60ab am: e0907cf5f2 am: 04428686b9 am: 2970bb4f43
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2198793

Change-Id: I9a8ac95b3cf10fbc9c52d7ceae41c6224a73e90f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 21:16:22 +00:00
Shunkai Yao
0f7bf04540 AIDL effect: Minimal example implementation am: c23916b96f am: 082f06b5f0 am: 00367c28e3 am: 6e8e2f1423
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2198792

Change-Id: Ica829707ac617e85264e324c6f89369cd0c83869
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 21:16:20 +00:00
Shunkai Yao
1cce4bcd4b AIDL effect: Initial IFactory interface definition am: f1d6039f96 am: 2b69b4b29f am: ef34d62d01 am: 303a01a670
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2198791

Change-Id: I1c39f7f52d0bb9b16c3672627bcddd01c787de2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 21:16:15 +00:00
Shunkai Yao
39be76e891 AIDL effect: Extract common parts of effect service into cc_defaults am: 43f9a07e04 am: acfc7ae9cb am: 4526d844d1
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2198794

Change-Id: I8b218ac253747583202ae2443c08a456008922d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 20:50:32 +00:00
Shunkai Yao
2970bb4f43 AIDL effect: Add vts for the initial effect AIDL interface implementation am: 67b1be60ab am: e0907cf5f2 am: 04428686b9
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2198793

Change-Id: I676c9d6cf215df3175cba73b66acf95ebb0336b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 20:50:31 +00:00
Shunkai Yao
6e8e2f1423 AIDL effect: Minimal example implementation am: c23916b96f am: 082f06b5f0 am: 00367c28e3
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2198792

Change-Id: I58ffa16e376938ddc844083009473eb0fdf0ac4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 20:50:29 +00:00
Shunkai Yao
303a01a670 AIDL effect: Initial IFactory interface definition am: f1d6039f96 am: 2b69b4b29f am: ef34d62d01
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2198791

Change-Id: I8bdf3be041e832d7d6f4382c0ad9ff1d3cb331f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 20:50:24 +00:00
Sally Qi
0435c6b4f3 Add cc_defaults wrapper for android.hardware.graphics.allocator ndk
package.

- to avoid manually rev up if needed.

Bug: 243429120
Test: builds
Change-Id: I25bfcc203cda61af308c37c3766fa9efe6c6784c
2022-09-01 13:28:00 -07:00
Shunkai Yao
4526d844d1 AIDL effect: Extract common parts of effect service into cc_defaults am: 43f9a07e04 am: acfc7ae9cb
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2198794

Change-Id: I9faeb1598f00db6b59311fb04a09be0be7e3c718
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 20:19:01 +00:00
Shunkai Yao
04428686b9 AIDL effect: Add vts for the initial effect AIDL interface implementation am: 67b1be60ab am: e0907cf5f2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2198793

Change-Id: I8469fa932841cf445cab55188c1caa0a61c0ff6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 20:18:58 +00:00
Shunkai Yao
00367c28e3 AIDL effect: Minimal example implementation am: c23916b96f am: 082f06b5f0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2198792

Change-Id: I0b9ebeb6234d007c189139f2b2e6e48a05c5763f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 20:18:56 +00:00
Shunkai Yao
ef34d62d01 AIDL effect: Initial IFactory interface definition am: f1d6039f96 am: 2b69b4b29f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2198791

Change-Id: I314dcdc1ae7a2554b7c7ce2d06f76d313bbb61fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 20:18:53 +00:00
Shunkai Yao
acfc7ae9cb AIDL effect: Extract common parts of effect service into cc_defaults am: 43f9a07e04
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2198794

Change-Id: Iabe3e5899197be286db19c8ffa9429a492764e0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 19:57:33 +00:00
Shunkai Yao
e0907cf5f2 AIDL effect: Add vts for the initial effect AIDL interface implementation am: 67b1be60ab
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2198793

Change-Id: I26428d4b3eb3e3b1caed9761799755b62ad1fdea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 19:57:32 +00:00
Shunkai Yao
082f06b5f0 AIDL effect: Minimal example implementation am: c23916b96f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2198792

Change-Id: I7cf14ef2cfd2a7ea88aaf0c005d903bd51c5f7f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 19:57:28 +00:00
Shunkai Yao
2b69b4b29f AIDL effect: Initial IFactory interface definition am: f1d6039f96
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2198791

Change-Id: Iba9355ce9775d8f8bd8213d11bd31070209c2e98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 19:57:21 +00:00
Mikhail Naganov
8e3480edfe audio: Add checks to effects feature configs retrieval
The size of the feature config needs to be limited
by the Binder transaction size. This check is enforced
before calling into legacy C API.

Also, fixed invalid calculation of buffer size
in Effect::getSupportedConfigsImpl.

Bug: 240266798
Test: atest VtsHalAudioEffectV7_0TargetTest
Change-Id: I1a1f7931a07e28642967fa68d9a358429138db29
2022-09-01 00:35:52 +00:00
Arati Gerdes
b158823325 [automerger skipped] Merge "DO NOT MERGE Add missing WINDOW_MOVE properties to DefaultConfig.h" into tm-qpr-dev am: 44c3a78ff1 am: 7c1389fc15 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I74713b0939082feb63292fa213edc11d7ad06f4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-31 23:58:49 +00:00
Arati Gerdes
3bff2c79df [automerger skipped] DO NOT MERGE Add missing WINDOW_MOVE properties to DefaultConfig.h am: 76070519eb am: f823a30dcf -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifef82f70a312d17fce1648f7e95b39caa150a677
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-31 23:58:45 +00:00
Arati Gerdes
7c1389fc15 Merge "DO NOT MERGE Add missing WINDOW_MOVE properties to DefaultConfig.h" into tm-qpr-dev am: 44c3a78ff1
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19755625

Change-Id: I5cd004738b608d72638b4012dc31b9ab78169d52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-31 23:52:13 +00:00
Arati Gerdes
f823a30dcf DO NOT MERGE Add missing WINDOW_MOVE properties to DefaultConfig.h am: 76070519eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/19755625

Change-Id: Ic1818b03faf82198003d2a311b4d9bb449625b1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-31 23:52:09 +00:00
Arati Gerdes
44c3a78ff1 Merge "DO NOT MERGE Add missing WINDOW_MOVE properties to DefaultConfig.h" into tm-qpr-dev 2022-08-31 23:41:13 +00:00