Yahan Zhou
883bb1be80
Merge "Camera: fix recursive lock in CameraDevice 1.0" into oc-dev am: eed6653f2a
...
am: 2ff1f7e687
2017-06-23 18:04:56 +00:00
Yahan Zhou
2ff1f7e687
Merge "Camera: fix recursive lock in CameraDevice 1.0" into oc-dev
...
am: eed6653f2a
2017-06-23 17:59:25 +00:00
TreeHugger Robot
eed6653f2a
Merge "Camera: fix recursive lock in CameraDevice 1.0" into oc-dev
2017-06-23 17:51:16 +00:00
Steven Moreland
5e2d6e2959
Merge "Remove toString methods in Vehicle HAL." into oc-dev-plus-aosp
...
am: 990b076833
2017-06-23 17:23:57 +00:00
Steven Moreland
990b076833
Merge "Remove toString methods in Vehicle HAL." into oc-dev-plus-aosp
2017-06-23 17:14:02 +00:00
Android Build Merger (Role)
a539931f3f
Merge "Merge "Test import of a EC P-521 key." into oc-dev am: ad40c6ccd7 -s ours am: 3ac476c241 -s ours" into oc-dr1-dev-plus-aosp
2017-06-23 15:44:32 +00:00
Shawn Willden
a36cf1c6a0
Merge "Test import of a EC P-521 key." into oc-dev am: ad40c6ccd7
...
am: 6715433ca7
2017-06-23 15:44:17 +00:00
Shawn Willden
8b1fab7e53
Merge "Test import of a EC P-521 key." into oc-dev am: ad40c6ccd7 -s ours
...
am: 3ac476c241
2017-06-23 15:44:17 +00:00
Shawn Willden
6715433ca7
Merge "Test import of a EC P-521 key." into oc-dev
...
am: ad40c6ccd7
2017-06-23 15:39:19 +00:00
Shawn Willden
3ac476c241
Merge "Test import of a EC P-521 key." into oc-dev
...
am: ad40c6ccd7
2017-06-23 15:39:17 +00:00
TreeHugger Robot
ad40c6ccd7
Merge "Test import of a EC P-521 key." into oc-dev
2017-06-23 15:32:16 +00:00
Etan Cohen
195ea85e82
Merge "[WIFI] Remove dependency on vendor-specific library" into oc-dev am: 74f7ccd680 -s ours
...
am: ef0bc81641
2017-06-23 12:48:26 +00:00
Etan Cohen
7034de9bcb
[WIFI] Remove dependency on vendor-specific library am: 0a2ef0302e -s ours
...
am: a8abe92608
2017-06-23 12:47:46 +00:00
Etan Cohen
72399c280d
Merge "[WIFI] Remove dependency on vendor-specific library" into oc-dev am: 74f7ccd680 -s ours
...
am: ccd223a144
2017-06-23 12:44:59 +00:00
Etan Cohen
ccd223a144
Merge "[WIFI] Remove dependency on vendor-specific library" into oc-dev
...
am: 74f7ccd680
2017-06-23 12:21:52 +00:00
Etan Cohen
ef0bc81641
Merge "[WIFI] Remove dependency on vendor-specific library" into oc-dev
...
am: 74f7ccd680
2017-06-23 05:03:40 +00:00
Etan Cohen
a8abe92608
[WIFI] Remove dependency on vendor-specific library
...
am: 0a2ef0302e
2017-06-23 05:02:53 +00:00
TreeHugger Robot
74f7ccd680
Merge "[WIFI] Remove dependency on vendor-specific library" into oc-dev
2017-06-23 04:57:04 +00:00
Yahan Zhou
77dd4aaad3
Camera: fix recursive lock in CameraDevice 1.0
...
Several functions call close() while they are holding a lock, which
results in recursive locking. This CL implements close_locked() to avoid
such behavior.
Bug: 62919192
Test: run vts -m VtsHalCameraProviderV2_4Target, and camera should still
work after it
Change-Id: Ib38e1de19ed3c927bfb645c0c777c04f157f2b88
2017-06-23 00:28:11 +00:00
Shawn Willden
d31b9dffda
Test import of a EC P-521 key.
...
am: 2bd3e23f3c
2017-06-22 23:54:31 +00:00
Shawn Willden
709e2e1ed9
Test import of a EC P-521 key.
...
This failure is also diagnosed by CTS, but it should be validated in VTS
as well.
Merged-In: Ia7654ff8813942fbca9dfa838337e9de5839a9e2
Bug: 33945114
Test: adb shell data/nativetests64/VtsHalKeymasterV3_0TargetTest/VtsHalKeymasterV3_0TargetTest
Change-Id: Ia7654ff8813942fbca9dfa838337e9de5839a9e2
2017-06-22 15:14:30 -06: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
899ee04948
Merge "Offload HAL HIDL: Add return values to synchronous calls" into oc-dr1-dev
...
am: 934946a48c
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
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
2017-06-22 06:01:38 +00:00
Fabien Sanglard
3836410494
Skip Validate am: 11ec393689
...
am: 47bd6b4a71
2017-06-22 06:01:01 +00:00
Fabien Sanglard
47bd6b4a71
Skip Validate
...
am: 11ec393689
2017-06-22 05:58:08 +00:00
Fabien Sanglard
a7b0e2785b
Skip Validate
...
am: 11ec393689
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
Steven Moreland
cb4537288b
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
Merged-In: I522630267beb7f87713a0a54c1ecb38077dc1b4e
Change-Id: I522630267beb7f87713a0a54c1ecb38077dc1b4e
2017-06-21 23:56:32 +00:00
sqian
a255484f25
Update IRadioResponse.hal documentation
...
am: 6381ac46aa
2017-06-21 20:59:30 +00: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
514e9c074e
Merge "Update hash and VTS for the 2nd FD of dumpstate" into oc-dr1-dev
...
am: 79fb65bb7b
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
a45f631f44
Merge "Check return from DeleteKey correctly." into oc-dev am: c4f859d1b5
...
am: 18996b5aa5
2017-06-21 01:00:57 +00:00
Shawn Willden
c0ff380223
Merge "Check return from DeleteKey correctly." into oc-dev am: c4f859d1b5
...
am: da4568eb18
2017-06-21 00:58:33 +00:00
Shawn Willden
18996b5aa5
Merge "Check return from DeleteKey correctly." into oc-dev
...
am: c4f859d1b5
2017-06-21 00:54:09 +00:00
Shawn Willden
da4568eb18
Merge "Check return from DeleteKey correctly." into oc-dev
...
am: c4f859d1b5
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
68b03188f3
Make camera/drm helper classes available to system.
...
am: 14adc6ebc0
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
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
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
2017-06-20 11:05:47 +00:00
Wyatt Riley
d50d573be9
Merge "Clear notification count to handle different flows" into oc-dev
...
am: fae2852b2b
2017-06-20 11:03:47 +00:00
Wyatt Riley
7ab2da1243
Merge "Clear notification count to handle different flows" into oc-dev
...
am: fae2852b2b
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
3fd2e1c791
Merge "Move CameraParameters class to android.hardware.camera.common@1.0-helper" into oc-dr1-dev
...
am: e599e41a1e
2017-06-20 07:20:17 +00:00
