Automerger Merge Worker
98b2c4dfbb
Merge "Add android.hardware.secure_element@1.2" am: 5b7f7d0b67 am: 6ee646adc4
...
Change-Id: I7ee92b7e3c74defdb0aedf4181a5b65571ba6e30
2020-01-23 03:42:01 +00:00
Automerger Merge Worker
20a6e2f6d7
Merge "Add SIM Depersonalisation interface" am: 81626dc493 am: 58073a8f2a
...
Change-Id: I054ad9ee73d9075e387a2910a145784ff2298584
2020-01-23 03:34:46 +00:00
Automerger Merge Worker
68adc58a90
Merge "Initialize paths for health 2.1 + batteryCapacityLevelPath + batteryChargeTimeToFullNowPath" am: 0e7081d5ed am: 32234ee7fa
...
Change-Id: I703f8c4f40c0a53080dd7b886eef5efa9925081c
2020-01-23 03:34:36 +00:00
Jack Yu
6ee646adc4
Merge "Add android.hardware.secure_element@1.2"
...
am: 5b7f7d0b67
Change-Id: I2ad0a963620b71b8d20c95b37b311a2890df82f6
2020-01-22 19:22:21 -08:00
Michele Berionne
58073a8f2a
Merge "Add SIM Depersonalisation interface"
...
am: 81626dc493
Change-Id: I42521bfbf79e98b89100655cf0de3b8f1c4bd074
2020-01-22 19:19:56 -08:00
Stephane Lee
32234ee7fa
Merge "Initialize paths for health 2.1 + batteryCapacityLevelPath + batteryChargeTimeToFullNowPath"
...
am: 0e7081d5ed
Change-Id: Ic092adf7ae14b10ef56aa97d1d37a69c62ce1422
2020-01-22 19:17:00 -08:00
Treehugger Robot
5b7f7d0b67
Merge "Add android.hardware.secure_element@1.2"
2020-01-23 02:00:02 +00:00
Michele Berionne
81626dc493
Merge "Add SIM Depersonalisation interface"
2020-01-23 01:10:49 +00:00
Stephane Lee
0e7081d5ed
Merge "Initialize paths for health 2.1 + batteryCapacityLevelPath + batteryChargeTimeToFullNowPath"
2020-01-23 00:39:07 +00:00
Automerger Merge Worker
861f5e15a8
Merge "misc drm@1.2 vts fixes" am: 1d85278536 am: cf7622ccd6
...
Change-Id: I39bf388c5470e318876eff9097b7155ec3568b56
2020-01-23 00:20:49 +00:00
Robert Shih
cf7622ccd6
Merge "misc drm@1.2 vts fixes"
...
am: 1d85278536
Change-Id: If954db85d1d5b6e8eddbf0b18c382c31ea618ad6
2020-01-22 16:09:02 -08:00
Treehugger Robot
1d85278536
Merge "misc drm@1.2 vts fixes"
2020-01-22 23:46:15 +00:00
Robert Shih
52cb498569
misc drm@1.2 vts fixes
...
* Add VendorModules::getModuleByName
* Skip unsupported schemes in setup
* Skip non-clearkey instances when running clearkey specific tests
* Don't skip clearkey tests for clearkey instance
Bug: 142397658
Change-Id: I44a6b43dd52fbb48cdbb5a077517e3d96acd0a3d
2020-01-22 21:23:14 +00:00
Automerger Merge Worker
04728790fa
Merge changes from topic "engine_vts" am: 24a21c1b53 am: eb3c4cbe0b
...
Change-Id: I16334e414880f12721d04abcaad5dc9e76f6e613
2020-01-22 18:46:25 +00:00
Automerger Merge Worker
c605a940b7
audio: Add VTS for configurable engine am: b449cdb228 am: 45e735733f
...
Change-Id: Ifffffbd9471a6012f84232eab55fdcd5191601a3
2020-01-22 18:46:23 +00:00
Automerger Merge Worker
1574fade9f
audio: update XSD for dynamic engine loading support config am: f282171776 am: bd5f74b53e
...
Change-Id: Ib90abda014d8e757c4649ae2fc58fe27f1148bd1
2020-01-22 18:46:21 +00:00
François Gaffie
eb3c4cbe0b
Merge changes from topic "engine_vts"
...
am: 24a21c1b53
Change-Id: I5d66369c23ae9e146b6b5840f90433c72f6c2d45
2020-01-22 10:28:07 -08:00
Franois Gaffie
45e735733f
audio: Add VTS for configurable engine
...
am: b449cdb228
Change-Id: I3c7f203ff6177fb5fd84905b08785959004c2cd8
2020-01-22 10:27:24 -08:00
Franois Gaffie
bd5f74b53e
audio: update XSD for dynamic engine loading support config
...
am: f282171776
Change-Id: Iad1dae8b30398efd511cb9d1f568b1a65ff869de
2020-01-22 10:26:40 -08:00
Treehugger Robot
24a21c1b53
Merge changes from topic "engine_vts"
...
* changes:
audiopolicy: engine: Add VTS for engine configurable configuration
audio: Add VTS for configurable engine
audio: update XSD for dynamic engine loading support config
2020-01-22 18:06:28 +00:00
Automerger Merge Worker
51ce8b1ee8
Merge "Updates to KM4.1" am: 7b37dc5d9c am: 7b1563832e
...
Change-Id: I6fe11f610788c61e45a2aa7eb8c33af367e3f8d8
2020-01-21 21:34:11 +00:00
Shawn Willden
7b1563832e
Merge "Updates to KM4.1"
...
am: 7b37dc5d9c
Change-Id: Id104154ff22b642507fa71d2cd976ca36188c6e9
2020-01-21 13:21:35 -08:00
Shawn Willden
7b37dc5d9c
Merge "Updates to KM4.1"
2020-01-21 21:18:21 +00:00
Automerger Merge Worker
d8fd3aa17e
Merge "Update Keymaster support lib OWNERS" am: f7238c9c01 am: e65c023c44
...
Change-Id: I77e313a681028dd8c1e92a8c51f974d478219a23
2020-01-21 17:59:28 +00:00
Shawn Willden
e65c023c44
Merge "Update Keymaster support lib OWNERS"
...
am: f7238c9c01
Change-Id: I25ea9632fa5d85ac198846a78d48d8f9004775af
2020-01-21 09:44:35 -08:00
Shawn Willden
f7238c9c01
Merge "Update Keymaster support lib OWNERS"
2020-01-21 17:40:38 +00:00
Shawn Willden
c0125fb930
Update Keymaster support lib OWNERS
...
Test: VtsHalKeymasterV4_0TargetTest && VtsHalKeymasterV4_1TargetTest
Change-Id: Ibc719cdc4bd8821d67659eb6a2cf4d0094322322
Merged-In: Ibc719cdc4bd8821d67659eb6a2cf4d0094322322
2020-01-21 10:30:29 -07:00
François Gaffie
a8cac48d0f
audiopolicy: engine: Add VTS for engine configurable configuration
...
This CL adds VTS test for engine PFW configuration files (Skipped
for default engine, the check is performed by reading the
audio_policy_configuration file AND parameter-framework top configuration
file)
AllSchemas.xsd is made by manual inclusion from all other
xsd files. It is used for API files generation.
Test: build & run vts --module VtsHalAudioPolicyV1_0Target
atest VtsHalAudioPolicyV1_0TargetTest
Bug: 141989952
Change-Id: I62730caadafdcb5ebb3083d683625424864afe97
Merged-In: I62730caadafdcb5ebb3083d683625424864afe97
Signed-off-by: François Gaffie <francois.gaffie@renault.com >
2020-01-17 21:42:55 -08:00
François Gaffie
b449cdb228
audio: Add VTS for configurable engine
...
This CL adds VTS tests for engine configuration.
Test: atest VtsHalAudioPolicyV1_0TargetTest
Bug: 141989952
Change-Id: Ied37edc5bba29ef461f6b68fa21781d5721b75bf
Merged-In: Ied37edc5bba29ef461f6b68fa21781d5721b75bf
Signed-off-by: François Gaffie <francois.gaffie@renault.com >
Signed-off-by: Mikhail Naganov <mnaganov@google.com >
2020-01-17 21:42:09 -08:00
François Gaffie
f282171776
audio: update XSD for dynamic engine loading support config
...
Bug: 141989952
Test: atest VtsHalAudioV6_0TargetTest
Change-Id: Ic0afc27f09d8387236444901dfddc5f0f074ba1b
Merged-In: Ic0afc27f09d8387236444901dfddc5f0f074ba1b
Signed-off-by: François Gaffie <francois.gaffie@renault.com >
2020-01-17 21:33:17 -08:00
Stephane Lee
8bc403e1e2
Initialize paths for health 2.1
...
+ batteryCapacityLevelPath
+ batteryChargeTimeToFullNowPath
Bug: 137790244
Test: lshal debug (health service)
Change-Id: I219ecc3dc77be70073761d9da5f5ee39ad76387d
2020-01-17 15:57:33 -08:00
Shawn Willden
f3d741744a
Updates to KM4.1
...
This CL adds:
- The IDENTITY_CREDENTIAL_KEY tag. This new tag is not actually used
by Keymaster at all. It's used by the new Identity Credential HAL in
its key attestations, which use the Keymaster format and the Keymaster
attestation key.
- A VerificationToken argument to deviceLocked, used for StrongBox
implementations.
- Some error codes, including one to diagnose unprovisioned
attestation keys/ids.
- Clarifications in the documentation.
Test: VtsHalKeymasterV41TargetTest
Change-Id: Iae7151e2d9b328dd73e5cd78e59687ef29bab4f0
Merged-In: Iae7151e2d9b328dd73e5cd78e59687ef29bab4f0
2020-01-17 15:52:07 -07:00
Automerger Merge Worker
0cf13f7ded
Merge "Decrement size of pending write queue by correct amount" am: 79fc8d0212 am: b492ac69b5
...
Change-Id: I4c49229efbcfeeaaa2e4e7299dbac230f2ae9caf
2020-01-17 21:19:12 +00:00
Anthony Stange
b492ac69b5
Merge "Decrement size of pending write queue by correct amount"
...
am: 79fc8d0212
Change-Id: I4d8f3d5bac10dd7192788cccf47ddcfa6231d7c8
2020-01-17 12:55:11 -08:00
Anthony Stange
79fc8d0212
Merge "Decrement size of pending write queue by correct amount"
2020-01-17 19:41:15 +00:00
Jack Yu
0d914d8c2a
Add android.hardware.secure_element@1.2
...
Test: None
Bug: 142495673
Change-Id: Ie0f3e87d58047b76ea47990a49d3eac745967255
2020-01-17 14:06:27 +00:00
Automerger Merge Worker
18b0839d06
Merge "Power: PowerHAL AIDL interface" am: 384eb8a2bb am: fd7e72f323
...
Change-Id: I5fc60d5adb92462ab81583ad97e21f1338e618a8
2020-01-16 22:57:07 +00:00
Wei Wang
fd7e72f323
Merge "Power: PowerHAL AIDL interface"
...
am: 384eb8a2bb
Change-Id: Id759e33d622bae7df8709eae5d9718c2a10f2828
2020-01-16 14:40:03 -08:00
Wei Wang
384eb8a2bb
Merge "Power: PowerHAL AIDL interface"
2020-01-16 22:35:42 +00:00
Automerger Merge Worker
e7682a1b81
Merge "Convert VtsHalDrmV1_*TargetTest to be parameterized test" am: ca61d1a366 am: d246996124
...
Change-Id: I2683bad347c0d6816e070de1a50449c5b403fe52
2020-01-16 19:06:19 +00:00
Automerger Merge Worker
ced0ad9e59
Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master" into stage-aosp-master am: ad45cff8d7
...
Change-Id: Id091b31f3f4dcf3b722540ef677f4f29662fb13f
2020-01-16 18:53:49 +00:00
Steven Moreland
d246996124
Merge "Convert VtsHalDrmV1_*TargetTest to be parameterized test"
...
am: ca61d1a366
Change-Id: Ieff14ff236c884e5611075258695987a2a606256
2020-01-16 10:38:30 -08:00
Steven Moreland
ca61d1a366
Merge "Convert VtsHalDrmV1_*TargetTest to be parameterized test"
2020-01-16 18:35:02 +00:00
Automerger Merge Worker
b8d8604ba0
DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: 7b2064edd5
...
Change-Id: Ia2f34996da33b6f92568377afd40f2b6752d71bd
2020-01-16 18:35:00 +00:00
TreeHugger Robot
ad45cff8d7
Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master" into stage-aosp-master
2020-01-16 18:29:18 +00:00
Automerger Merge Worker
7fded1f028
Enable QuantizationCouplingTest in NNAPI VTS am: 3c68b3412f am: cd74885540
...
Change-Id: I3597934821cc3d78735b281adefaa3a8e19d752e
2020-01-16 16:30:50 +00:00
Lev Proleev
cd74885540
Enable QuantizationCouplingTest in NNAPI VTS
...
am: 3c68b3412f
Change-Id: I44d980101c7e59e9262f2d91a83884c2325fb714
2020-01-16 08:16:51 -08:00
Lev Proleev
3c68b3412f
Enable QuantizationCouplingTest in NNAPI VTS
...
Bug: 137828994
Test: NNTest_static and VtsHalNeuralnetworksV1_3TargetTest
Change-Id: I9b4f20ab0287be9cae9fc1b69a8f64cc8f1996b0
Merged-In: I9b4f20ab0287be9cae9fc1b69a8f64cc8f1996b0
(cherry picked from commit baac15d5fd )
2020-01-16 13:22:33 +00:00
Automerger Merge Worker
8785913479
Merge "VHAL: fix CTS CarPropertyManagerTest#testRegisterCallback" am: 24148274cd am: 95568fb9a7
...
Change-Id: I22d6b74f4e587717ca8164d23d43c4a43b730668
2020-01-16 01:29:56 +00:00
Kai Wang
95568fb9a7
Merge "VHAL: fix CTS CarPropertyManagerTest#testRegisterCallback"
...
am: 24148274cd
Change-Id: Ib37e2e8f49b8a1253248bacde60b29269e14c681
2020-01-15 17:20:40 -08:00