Commit graph

5457 commits

Author SHA1 Message Date
Asaf Rosenfeld
03a2b77928 Merge "Adding Publisher ID to VMS HAL messages" 2017-06-23 04:56:26 +00:00
Shawn Willden
16e552ffea Test import of a EC P-521 key. am: 2bd3e23f3c
am: d31b9dffda

Change-Id: I4646393247ec672df9af618ef52363afde75821f
2017-06-23 00:04:11 +00:00
Shawn Willden
d31b9dffda Test import of a EC P-521 key.
am: 2bd3e23f3c

Change-Id: I8bb9337a2f8d85f0cddc885b67fd4d388d166077
2017-06-22 23:54:31 +00:00
Shawn Willden
2bd3e23f3c Test import of a EC P-521 key.
This failure is also diagnosed by CTS, but it should be validated in VTS
as well.

Bug: 33945114
Test: adb shell data/nativetests64/VtsHalKeymasterV3_0TargetTest/VtsHalKeymasterV3_0TargetTest
Change-Id: Ia7654ff8813942fbca9dfa838337e9de5839a9e2
2017-06-22 14:29:19 -06:00
Sohani Rao
15cb744bea Merge "Offload HAL HIDL: Add return values to synchronous calls" into oc-dr1-dev am: 934946a48c
am: 899ee04948

Change-Id: Iab13c27268b37b88e97fa6d23116e56a7a29dc47
2017-06-22 17:47:20 +00:00
Sohani Rao
899ee04948 Merge "Offload HAL HIDL: Add return values to synchronous calls" into oc-dr1-dev
am: 934946a48c

Change-Id: I00a6f097dc91aadd29d2e6afb8f1be4636ffb506
2017-06-22 17:43:24 +00:00
TreeHugger Robot
934946a48c Merge "Offload HAL HIDL: Add return values to synchronous calls" into oc-dr1-dev 2017-06-22 17:40:02 +00:00
Fabien Sanglard
53116a675a Merge "Skip Validate am: 11ec393689 am: a7b0e2785b" into oc-dr1-dev-plus-aosp
am: 1260bdb91d

Change-Id: Ie8b2d0e40b503f2138aa11fdfbffafbab838da3c
2017-06-22 06:05:32 +00:00
Fabien Sanglard
41a50ef23f Skip Validate am: 11ec393689 am: 47bd6b4a71
am: 3836410494

Change-Id: I7ad33085591fb525ecb3682e591130cf783a20e3
2017-06-22 06:04:35 +00:00
Android Build Merger (Role)
1260bdb91d Merge "Skip Validate am: 11ec393689 am: a7b0e2785b" into oc-dr1-dev-plus-aosp 2017-06-22 06:02:11 +00:00
Fabien Sanglard
7ad4d43645 Skip Validate am: 11ec393689
am: a7b0e2785b

Change-Id: I7d831ce16a35b9c0162c2b08f049fe8a9ce61bbd
2017-06-22 06:01:38 +00:00
Fabien Sanglard
3836410494 Skip Validate am: 11ec393689
am: 47bd6b4a71

Change-Id: Ifb29aa66b104d0162205e81dd58e6f7b65b739ad
2017-06-22 06:01:01 +00:00
Fabien Sanglard
47bd6b4a71 Skip Validate
am: 11ec393689

Change-Id: I47c68719ce214ee40ed0e58ec1a0ddc9c14a2b2a
2017-06-22 05:58:08 +00:00
Fabien Sanglard
a7b0e2785b Skip Validate
am: 11ec393689

Change-Id: I6e1121c116d51ad143878ea88f7d33c4af9f9e5b
2017-06-22 05:57:18 +00:00
Fabien Sanglard
11ec393689 Skip Validate
b/37474580
b/62806392

Test: marlin, ryu

Change-Id: I9d4ece40a8a093d768bcb4edd332cf0188735e66
2017-06-22 04:48:33 +00:00
TreeHugger Robot
f194531439 Merge "Remove toString methods in Vehicle HAL." 2017-06-22 01:13:44 +00:00
sqian
7c5cebb2e1 Update IRadioResponse.hal documentation am: 6381ac46aa
am: a255484f25

Change-Id: Id255f8ddf5893cc50648f84c741087c51dd743bc
2017-06-21 21:02:00 +00:00
sqian
a255484f25 Update IRadioResponse.hal documentation
am: 6381ac46aa

Change-Id: I78ff5ec68261682a26ec2a208b5dd82097f1f96a
2017-06-21 20:59:30 +00:00
Steven Moreland
c525408c60 Remove toString methods in Vehicle HAL.
These methods are already generated by HIDL, but this is
only now being realized.

Test: methods no longer conflict
Change-Id: I522630267beb7f87713a0a54c1ecb38077dc1b4e
2017-06-21 12:57:02 -07:00
sqian
6381ac46aa Update IRadioResponse.hal documentation
Update the error codes

A copy of https://partner-android-review.googlesource.com/#/c/836552/
+ some missed updated error codes
+ request_not_supported

Test: Manual
Bug: 35671595
Change-Id: I2880b442b5fd56149abc83949c12e2eba5ee67df
2017-06-21 10:26:47 -07:00
Jie Song
180a8ed591 Merge "Update hash and VTS for the 2nd FD of dumpstate" into oc-dr1-dev am: 79fb65bb7b
am: 514e9c074e

Change-Id: I3c3246697ec248d08b57beb82b0c9dc97a2b77b1
2017-06-21 02:01:37 +00:00
Jie Song
514e9c074e Merge "Update hash and VTS for the 2nd FD of dumpstate" into oc-dr1-dev
am: 79fb65bb7b

Change-Id: Ie20644fd70140817fb67eb361ee382c833728830
2017-06-21 01:56:03 +00:00
TreeHugger Robot
79fb65bb7b Merge "Update hash and VTS for the 2nd FD of dumpstate" into oc-dr1-dev 2017-06-21 01:49:26 +00:00
Shawn Willden
45b0e65a95 Merge "Check return from DeleteKey correctly." into oc-dev am: c4f859d1b5 am: 18996b5aa5
am: a45f631f44

Change-Id: Ie1bb36467ab7efea42beb2bc314d5a4ea7f0b90e
2017-06-21 01:03:29 +00:00
Shawn Willden
45ebbd2312 Merge "Check return from DeleteKey correctly." into oc-dev am: c4f859d1b5 am: da4568eb18
am: c0ff380223

Change-Id: Ibdef16931b9d57ce6b6accc7ce4fcb41aefc3238
2017-06-21 01:03:16 +00:00
Shawn Willden
a45f631f44 Merge "Check return from DeleteKey correctly." into oc-dev am: c4f859d1b5
am: 18996b5aa5

Change-Id: I36f1108e43c8d07181305bdd6464ecfcc5533b0e
2017-06-21 01:00:57 +00:00
Shawn Willden
c0ff380223 Merge "Check return from DeleteKey correctly." into oc-dev am: c4f859d1b5
am: da4568eb18

Change-Id: I59531a8ca8a0550a9e36ef1b8bb848f616fc153e
2017-06-21 00:58:33 +00:00
Shawn Willden
18996b5aa5 Merge "Check return from DeleteKey correctly." into oc-dev
am: c4f859d1b5

Change-Id: Id817044028fa9bf060305fa7864d8d89755353dc
2017-06-21 00:54:09 +00:00
Shawn Willden
da4568eb18 Merge "Check return from DeleteKey correctly." into oc-dev
am: c4f859d1b5

Change-Id: Ib41e416ab79a56cddbaa61084645f626b4a3b22b
2017-06-21 00:54:07 +00:00
TreeHugger Robot
c4f859d1b5 Merge "Check return from DeleteKey correctly." into oc-dev 2017-06-21 00:45:17 +00:00
Martijn Coenen
386f28c8bd Make camera/drm helper classes available to system. am: 14adc6ebc0
am: 68b03188f3

Change-Id: Id8c0e71639f54b0bfddc27b540791ebbf1297683
2017-06-20 18:53:20 +00:00
Martijn Coenen
68b03188f3 Make camera/drm helper classes available to system.
am: 14adc6ebc0

Change-Id: I6fd73c6d46245b690fae29edbfd7c8c4d2b5ea81
2017-06-20 18:42:19 +00:00
Jie Song
cc4ddffeec Update hash and VTS for the 2nd FD of dumpstate
Bug: 33820081
Test: Run VTS
Change-Id: I139dfed6edb20fada2676684ab7013daefa69bc8
2017-06-20 09:58:13 -07:00
Martijn Coenen
14adc6ebc0 Make camera/drm helper classes available to system.
As VTS tests are considered system and link against these.

Bug: 38302533
Bug: 62523241
Test: builds
Change-Id: Iac5c872c58ec9646d6d6974aacceb930daad7e5e
2017-06-20 08:57:46 -07:00
Wyatt Riley
5fd11b2304 Merge "Merge "Clear notification count to handle different flows" into oc-dev am: fae2852b2b am: d50d573be9" into oc-dr1-dev-plus-aosp
am: 7a09847ffc

Change-Id: I6331f175aa3cf00c77b20e244acb99cc06d7ad09
2017-06-20 11:08:33 +00:00
Wyatt Riley
67b1a7f8af Merge "Clear notification count to handle different flows" into oc-dev am: fae2852b2b am: 7ab2da1243
am: 0d7937ae51

Change-Id: I0c724ca7a2a967d00495fe3342bb293c35b03631
2017-06-20 11:08:18 +00:00
Android Build Merger (Role)
7a09847ffc Merge "Merge "Clear notification count to handle different flows" into oc-dev am: fae2852b2b am: d50d573be9" into oc-dr1-dev-plus-aosp 2017-06-20 11:06:00 +00:00
Wyatt Riley
0d7937ae51 Merge "Clear notification count to handle different flows" into oc-dev am: fae2852b2b
am: 7ab2da1243

Change-Id: I9857f2f6d6b783acf6235aa4c88be2e1ad6640cf
2017-06-20 11:05:47 +00:00
Wyatt Riley
ae66b606e9 Merge "Clear notification count to handle different flows" into oc-dev am: fae2852b2b
am: d50d573be9

Change-Id: Ic427c48471a0128a35d5f3c9b67f2d6e520681d7
2017-06-20 11:05:47 +00:00
Wyatt Riley
d50d573be9 Merge "Clear notification count to handle different flows" into oc-dev
am: fae2852b2b

Change-Id: I279f8f186304b44b2a1e003deee414d9db09199d
2017-06-20 11:03:47 +00:00
Wyatt Riley
7ab2da1243 Merge "Clear notification count to handle different flows" into oc-dev
am: fae2852b2b

Change-Id: I5b621ce7b89e8853dbb9abd2e14ec1020176936b
2017-06-20 11:03:18 +00:00
TreeHugger Robot
fae2852b2b Merge "Clear notification count to handle different flows" into oc-dev 2017-06-20 10:59:02 +00:00
Jiyong Park
f0fe70982e Merge "Move CameraParameters class to android.hardware.camera.common@1.0-helper" into oc-dr1-dev am: e599e41a1e
am: 3fd2e1c791

Change-Id: Icb180f0e502cc3953cad6584863812892b90b784
2017-06-20 07:22:43 +00:00
Jiyong Park
3fd2e1c791 Merge "Move CameraParameters class to android.hardware.camera.common@1.0-helper" into oc-dr1-dev
am: e599e41a1e

Change-Id: Idb29fad11b1ba3a22c25f44fdf1a3a697a3e35b4
2017-06-20 07:20:17 +00:00
TreeHugger Robot
e599e41a1e Merge "Move CameraParameters class to android.hardware.camera.common@1.0-helper" into oc-dr1-dev 2017-06-20 07:17:47 +00:00
Jiyong Park
578bcf28b9 Remove dependency to libmediadrm from drm HAL am: 07770c78e1
am: b62ca88160

Change-Id: Iff522277ba7469c82538168c8342ac20ee90961a
2017-06-20 03:39:46 +00:00
Jiyong Park
b62ca88160 Remove dependency to libmediadrm from drm HAL
am: 07770c78e1

Change-Id: I9963fa4da5dd779af03fa97b6b008326df216a97
2017-06-20 03:37:16 +00:00
Wyatt Riley
5d190b774e Clear notification count to handle different flows
Notifiation count now cleared in Setup (and
discarded messages warned about in Teardown.)

Fixes: 62645164
Test: passes on device
Change-Id: I7e88da7251464f281d7c98140d7a9b5a73d79542
(cherry picked from commit 6ec696b7fe)
2017-06-20 11:33:09 +08:00
Jiyong Park
07770c78e1 Remove dependency to libmediadrm from drm HAL
drm HAL has been using libmediadrm for android::SharedLibrary class and
android::PluginLoader class. This is a Treble violation since
libmediadrm is a framework-only library that is not available to
vendors.

To solve the problem, the two classes are copied into this directory
to form a small static library android.hardware.drm@1.0-helper.a.

Bug: 38302533
Test: mm under /hardware/interfaces/drm/1.0/default and
/hardware/interfaces/drm/1.0/vts/functional

Change-Id: I7b4e5cdb3bc815e971e0c3b7ec99ea86042e13eb
2017-06-20 12:32:28 +09:00
Wyatt Riley
7171ffa0be Merge "Clear notification count to handle different flows" into oc-dr1-dev am: b0f192f654
am: 256b74bccd

Change-Id: Ib1b8cb68a980a9c65311be6481c506af76fad42a
2017-06-20 00:43:02 +00:00