Commit graph

30610 commits

Author SHA1 Message Date
TreeHugger Robot
4c51ec1b9a Merge "Use current sdk in hardware.vibrator java backend" into sc-dev 2021-03-04 20:09:58 +00:00
Xin Li
a990120103 [automerger skipped] Merge "Merge RQ2A.210305.007" am: 603a44d975 -s ours am: 913bc4bf27 -s ours am: 5a95fef4c2 -s ours
am skip reason: Change-Id I6eee7a4b0960b767b6620c8b93dc252422c42f25 with SHA-1 6ee1f2d8f2 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I330cb26c550108a80da7fa876590fe53cae5766a
2021-03-04 00:12:18 +00:00
Shawn Willden
6af85f1552 Merge "Add performOperation stub." am: 4411dc963c am: 421806ad79 am: 0fbf87918d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1596937

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1a10ce712cde9410ad6cbcfc05c2ecdafdf57476
2021-03-04 00:08:01 +00:00
Xin Li
5a95fef4c2 [automerger skipped] Merge "Merge RQ2A.210305.007" am: 603a44d975 -s ours am: 913bc4bf27 -s ours
am skip reason: Change-Id I6eee7a4b0960b767b6620c8b93dc252422c42f25 with SHA-1 6ee1f2d8f2 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4acac07c7c0e0903ce83375258debff8ccd38872
2021-03-03 23:37:17 +00:00
Shawn Willden
0fbf87918d Merge "Add performOperation stub." am: 4411dc963c am: 421806ad79
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1596937

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie8ad7217a5fe962bd9b971fde106eabc089c2429
2021-03-03 22:38:37 +00:00
Xin Li
913bc4bf27 [automerger skipped] Merge "Merge RQ2A.210305.007" am: 603a44d975 -s ours
am skip reason: Change-Id I6eee7a4b0960b767b6620c8b93dc252422c42f25 with SHA-1 6ee1f2d8f2 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic806d162818078954958f347890a861f4713b714
2021-03-03 22:29:38 +00:00
Treehugger Robot
e0fb8a1ef3 Merge "audio: Verify that VTS tests can work with vendor extensions" am: a8b93afc00 am: a40f50ddc0 am: 5e8b252609
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1612588

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I270f2a9c9a35d1c0325201b319e5911995a5315b
2021-03-03 22:04:41 +00:00
Shawn Willden
421806ad79 Merge "Add performOperation stub." am: 4411dc963c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1596937

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I22425bcd737918b337483d0756e3e251a4061b51
2021-03-03 22:00:01 +00:00
Xin Li
603a44d975 Merge "Merge RQ2A.210305.007" 2021-03-03 21:41:29 +00:00
Shawn Willden
4411dc963c Merge "Add performOperation stub." 2021-03-03 21:28:32 +00:00
Treehugger Robot
5e8b252609 Merge "audio: Verify that VTS tests can work with vendor extensions" am: a8b93afc00 am: a40f50ddc0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1612588

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifa1b0a45fd1b5bfb5726401d3d256b702344fc7a
2021-03-03 20:53:56 +00:00
Sarah Chin
482baa3a89 [automerger skipped] Merge "API updates for TrafficDescriptr fields" am: c2ccef2e2a am: a6ce4c80e8 am: 25b4a133ea -s ours
am skip reason: Change-Id I33018ad413875f4fae1497ed5acc8ee50df7c942 with SHA-1 c5a3798288 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I32d65b0ca884d9cf2aa90d9c5b3ef9bea7578a75
2021-03-03 20:24:13 +00:00
Treehugger Robot
ca0dd5740a Merge "Memtrack HAL: Update documentation" am: 620ad1ca3f am: 37961ff47c am: 9c570e0cd3
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1611823

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I03528969319fbe6207cd677cf47e0b3940b70e0e
2021-03-03 20:20:31 +00:00
Treehugger Robot
a40f50ddc0 Merge "audio: Verify that VTS tests can work with vendor extensions" am: a8b93afc00
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1612588

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3c7849b16ecaff6a0b5b3e1f99e879dd2ce0c951
2021-03-03 20:17:13 +00:00
Treehugger Robot
a8b93afc00 Merge "audio: Verify that VTS tests can work with vendor extensions" 2021-03-03 19:59:01 +00:00
Sarah Chin
25b4a133ea Merge "API updates for TrafficDescriptr fields" am: c2ccef2e2a am: a6ce4c80e8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1593911

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icae1969e60d61ed92fcc1caff55eab0ad5b8ff8a
2021-03-03 19:29:48 +00:00
Jimmy Chen
52d0565fc1 Merge "wifi: add comment for SAE_PK capability" into sc-dev 2021-03-03 19:13:21 +00:00
Treehugger Robot
9c570e0cd3 Merge "Memtrack HAL: Update documentation" am: 620ad1ca3f am: 37961ff47c
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1611823

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5545dc26df7e9870003cd66cd63c171a1988fae3
2021-03-03 19:04:26 +00:00
Sarah Chin
a6ce4c80e8 Merge "API updates for TrafficDescriptr fields" am: c2ccef2e2a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1593911

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3870099c000a3efc0ae85a5db081dd6f8a4f6651
2021-03-03 18:59:57 +00:00
Sarah Chin
c2ccef2e2a Merge "API updates for TrafficDescriptr fields" 2021-03-03 18:42:20 +00:00
Treehugger Robot
37961ff47c Merge "Memtrack HAL: Update documentation" am: 620ad1ca3f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1611823

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5234b508cae8d55b22852e53063d8f53b49580ec
2021-03-03 18:30:12 +00:00
Treehugger Robot
620ad1ca3f Merge "Memtrack HAL: Update documentation" 2021-03-03 17:38:40 +00:00
Xin Li
9e5819285e Merge RQ2A.210305.007
Bug: 180401296
Merged-In: I6eee7a4b0960b767b6620c8b93dc252422c42f25
Change-Id: I6fa3b10e629fb748b5b0d91487ca5365c2b53705
2021-03-03 09:12:11 -08:00
Andy Hung
75f1c2d01e Merge "Add fields related to active audio presentation rendering" am: 947b82bee2 am: 92372dc28d am: f495c326a0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1591515

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8f6b4f78107118efd911ed9c52fe8d14461d87ba
2021-03-03 13:27:47 +00:00
Andy Hung
f495c326a0 Merge "Add fields related to active audio presentation rendering" am: 947b82bee2 am: 92372dc28d
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1591515

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id85840e0065ff02d4e296f3290832573b1a0d84a
2021-03-03 08:07:45 +00:00
Andy Hung
92372dc28d Merge "Add fields related to active audio presentation rendering" am: 947b82bee2
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1591515

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I836853ebcb42b761af13f658f8b6f50857cea33e
2021-03-03 03:08:50 +00:00
Andy Hung
947b82bee2 Merge "Add fields related to active audio presentation rendering" 2021-03-03 02:37:13 +00:00
Kevin Chyn
366270cd6a Merge "Add IFingerprint AcquiredInfo.IMMOBILE" into sc-dev 2021-03-03 01:50:42 +00:00
Treehugger Robot
8507998040 Merge "Add VtsHalNeuralnetworksTargetTest to NNAPI test mapping" am: 5ae082aad5 am: 8138ebc7c0 am: 1165b395c4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1612122

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia47c896c17d61bc33db35ecb047746fddc006d35
2021-03-03 01:38:54 +00:00
Sarah Chin
912e6062ab API updates for TrafficDescriptr fields
Bug: 179312227
Test: atest VtsHalRadioV1_6TargetTest
Change-Id: I33018ad413875f4fae1497ed5acc8ee50df7c942
Merged-In: I33018ad413875f4fae1497ed5acc8ee50df7c942
2021-03-02 17:28:10 -08:00
Treehugger Robot
1165b395c4 Merge "Add VtsHalNeuralnetworksTargetTest to NNAPI test mapping" am: 5ae082aad5 am: 8138ebc7c0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1612122

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idc9c98ad6b6215deb03da3df57113c5b53d5f018
2021-03-03 00:53:12 +00:00
Kalesh Singh
d02d2c4060 Memtrack HAL: Update documentation
Detail what is expected to be returned by the different memtrack types.

Add what the device name is expected to be in getGpuDeviceInfo()

Bug: 181704406
Test: N/A
Change-Id: I5e9fe0bf5e630a8a0ec8394fa4f508657e4a56a7
2021-03-02 19:39:27 -05:00
Sarah Chin
f4ee2b9192 [automerger skipped] Merge changes from topics "5g_slicing_hal_vts_on_aosp_1st_part", "5g_slicing_hal_vts_on_aosp_2nd_part" am: 3c24b7500a am: b19025ad86 am: 355ebd8f89 -s ours
am skip reason: Change-Id I5dc97d3c49d0bf4726975a5558360ebf9c09224b with SHA-1 687ffe58de is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id7c3b0b0b0f5296d063cb40cd670096f52647c8a
2021-03-03 00:21:55 +00:00
Hongbo Zeng
01255ad9c2 [automerger skipped] Update HAL 1.6 for 5G Slicing am: 55487e1e79 am: 6bd59033fb am: af42a972dd -s ours
am skip reason: Change-Id Ibf6d92d50c8c2c3fce51522677d75bf33127320f with SHA-1 5bd43606ee is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2c706aadf89ccb427baf1e84eb5e14bce8b82cfc
2021-03-03 00:21:52 +00:00
Kevin Chyn
1ca75eca02 Add IFingerprint AcquiredInfo.IMMOBILE
Fixes: 181278306
Test: make -j android.hardware.biometrics.fingerprint-update-api
Change-Id: I1ad9156ecfd2bf0b9efcb7a78871ca27aa97f7b7
2021-03-02 16:19:11 -08:00
Treehugger Robot
8138ebc7c0 Merge "Add VtsHalNeuralnetworksTargetTest to NNAPI test mapping" am: 5ae082aad5
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1612122

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7c6076cb3a40db45f26e7ac6a9371509b2a1ea31
2021-03-03 00:14:54 +00:00
Sarah Chin
355ebd8f89 Merge changes from topics "5g_slicing_hal_vts_on_aosp_1st_part", "5g_slicing_hal_vts_on_aosp_2nd_part" am: 3c24b7500a am: b19025ad86
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1579886

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iab504bbbe6dda6c8e4015f0ab7cf5c7010d3e6e0
2021-03-02 23:53:24 +00:00
Hongbo Zeng
af42a972dd Update HAL 1.6 for 5G Slicing am: 55487e1e79 am: 6bd59033fb
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1579885

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I98d47835a985676a0d108078491d2fc62acd4553
2021-03-02 23:53:21 +00:00
Sarah Chin
b19025ad86 Merge changes from topics "5g_slicing_hal_vts_on_aosp_1st_part", "5g_slicing_hal_vts_on_aosp_2nd_part" am: 3c24b7500a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1579886

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic109a7d20174081381253ad69d5628af11911fbf
2021-03-02 23:39:37 +00:00
Hongbo Zeng
6bd59033fb Update HAL 1.6 for 5G Slicing am: 55487e1e79
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1579885

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I10efed450df99d35e7f7ff312e846b37d76d64d1
2021-03-02 23:38:19 +00:00
Treehugger Robot
5ae082aad5 Merge "Add VtsHalNeuralnetworksTargetTest to NNAPI test mapping" 2021-03-02 23:22:29 +00:00
Sarah Chin
3c24b7500a Merge changes from topics "5g_slicing_hal_vts_on_aosp_1st_part", "5g_slicing_hal_vts_on_aosp_2nd_part"
* changes:
  Support SlicingConfig for 5G Slicing Configuration
  Update HAL 1.6 for 5G Slicing
2021-03-02 22:56:06 +00:00
Mikhail Naganov
8ebfba6589 audio: Verify that VTS tests can work with vendor extensions
Vendors can have vendor-extended device types and
audio formats supported by their HALs and frameworks.
VTS tests are built using AOSP sources, thus they don't
have these vendor modifications. Ensure that VTS tests
behave correctly when dealing with audio policy manager
configurations that contain vendor extensions.

Since verifying this behavior requires using specially
crafted APM configs, verification is done using
unit tests.

Test: atest HalAudioV6_0GeneratorTest
Test: atest HalAudioV7_0GeneratorTest
Change-Id: I9dc1a18863418a8fbd7d1dc14abc844fd9060ca5
2021-03-02 13:16:59 -08:00
TreeHugger Robot
59e481dfe0 Merge "Add biometrics/common/aidl OWNERS" into sc-dev 2021-03-02 19:13:03 +00:00
Lev Proleev
81dbdb3196 Add VtsHalNeuralnetworksTargetTest to NNAPI test mapping
Bug: 172921927
Test: presubmit on cuttlefish
Change-Id: Ia59446246bef2a41912a6b0c9d11abd125e8d913
Merged-In: Ia59446246bef2a41912a6b0c9d11abd125e8d913
(cherry picked from commit 3665d245ad)
2021-03-02 17:40:39 +00:00
TreeHugger Robot
22bebf247a Merge "Camera: Fix double-free in removeCamera" into sc-dev 2021-03-02 17:06:12 +00:00
Jimmy Chen
b471a062f9 wifi: add comment for SAE_PK capability
Bug: 181603483
Test: atest VtsHalWifiSupplicantV1_4TargetTest
Change-Id: If66f1ad0b3c44190beacb48c988c47fe8767bfee
2021-03-02 16:03:11 +08:00
TreeHugger Robot
4f8dbd55b0 Merge "Wifi: Change the type from long to int for contention time statistics" into sc-dev 2021-03-02 07:57:13 +00:00
Treehugger Robot
17150640d5 Merge "Explictly disallow LTE_CA as a RAT type" am: 81fcfa6295 am: 6ee1f2d8f2 am: 957c8d2a36
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1611604

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieb61ef54564e3d25bf3cbc81162930023c19391b
2021-03-02 03:52:34 +00:00
Treehugger Robot
fbd34c5df7 Merge "[automotive] Use new jsoncpp API" am: 3d22587ce7 am: aff567a81f am: e198860c27
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1608216

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id90eb2e4b62863e858eca8915084c6fec421a472
2021-03-02 03:52:24 +00:00