OSDN Git Service
Etan Cohen [Fri, 23 Jun 2017 13:11:52 +0000 (13:11 +0000)]
[WIFI] Remove dependency on vendor-specific library am:
0a2ef0302e -s ours am:
a8abe92608 -s ours
am:
7034de9bcb -s ours
Change-Id: I936f66497d0b27e345640879431122e5705571ae
Etan Cohen [Fri, 23 Jun 2017 13:10:28 +0000 (13:10 +0000)]
Merge "[WIFI] Remove dependency on vendor-specific library" into oc-dev am:
74f7ccd680 -s ours am:
ccd223a144 -s ours
am:
72399c280d -s ours
Change-Id: I39a416dc5e1f272c7c2b4c8d335a3d1242204884
Etan Cohen [Fri, 23 Jun 2017 12:47:46 +0000 (12:47 +0000)]
[WIFI] Remove dependency on vendor-specific library am:
0a2ef0302e -s ours
am:
a8abe92608 -s ours
Change-Id: I4ae34a10604d366e9da5f79526ad0317d0debf85
Etan Cohen [Fri, 23 Jun 2017 12:44:59 +0000 (12:44 +0000)]
Merge "[WIFI] Remove dependency on vendor-specific library" into oc-dev am:
74f7ccd680 -s ours
am:
ccd223a144 -s ours
Change-Id: Ib3ca1d91824cf9c4de277e4e6b8c1d4ebbe363ae
Etan Cohen [Fri, 23 Jun 2017 12:21:52 +0000 (12:21 +0000)]
Merge "[WIFI] Remove dependency on vendor-specific library" into oc-dev
am:
74f7ccd680 -s ours
Change-Id: Ie7afaaf44b8f4555095bbe75d77f4b7bd3e8b5a2
TreeHugger Robot [Fri, 23 Jun 2017 11:07:12 +0000 (11:07 +0000)]
Merge "bug fix: pass comp name information to port reconfiguration at all calls"
Etan Cohen [Fri, 23 Jun 2017 05:02:53 +0000 (05:02 +0000)]
[WIFI] Remove dependency on vendor-specific library
am:
0a2ef0302e -s ours
Change-Id: If0eb31b23bc9e8fcb925fa3c157e4c39ef33d167
TreeHugger Robot [Fri, 23 Jun 2017 04:57:02 +0000 (04:57 +0000)]
Merge "[WIFI] Remove dependency on vendor-specific library" into oc-dev
Asaf Rosenfeld [Fri, 23 Jun 2017 04:56:22 +0000 (04:56 +0000)]
Merge "Adding Publisher ID to VMS HAL messages"
Shawn Willden [Fri, 23 Jun 2017 00:04:11 +0000 (00:04 +0000)]
Test import of a EC P-521 key. am:
2bd3e23f3c
am:
d31b9dffda
Change-Id: I4646393247ec672df9af618ef52363afde75821f
Shawn Willden [Thu, 22 Jun 2017 23:54:31 +0000 (23:54 +0000)]
Test import of a EC P-521 key.
am:
2bd3e23f3c
Change-Id: I8bb9337a2f8d85f0cddc885b67fd4d388d166077
Shawn Willden [Fri, 16 Jun 2017 14:18:06 +0000 (08:18 -0600)]
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
Sohani Rao [Thu, 22 Jun 2017 17:47:20 +0000 (17:47 +0000)]
Merge "Offload HAL HIDL: Add return values to synchronous calls" into oc-dr1-dev am:
934946a48c
am:
899ee04948
Change-Id: Iab13c27268b37b88e97fa6d23116e56a7a29dc47
Sohani Rao [Thu, 22 Jun 2017 17:43:24 +0000 (17:43 +0000)]
Merge "Offload HAL HIDL: Add return values to synchronous calls" into oc-dr1-dev
am:
934946a48c
Change-Id: I00a6f097dc91aadd29d2e6afb8f1be4636ffb506
TreeHugger Robot [Thu, 22 Jun 2017 17:40:01 +0000 (17:40 +0000)]
Merge "Offload HAL HIDL: Add return values to synchronous calls" into oc-dr1-dev
Ram Mohan M [Thu, 22 Jun 2017 08:23:12 +0000 (13:53 +0530)]
bug fix: pass comp name information to port reconfiguration at all calls
This is a follow up for
553f633762ef748d04717c3cc4b4dbfecb203620 commit
Test: make vts -j99 BUILD_GOOGLE_VTS=true TARGET_PRODUCT=aosp_arm64 \
&& vts-tradefed run commandAndExit vts \
--skip-all-system-status-check --primary-abi-only \
--skip-preconditions --module VtsHalMediaOmxV1_0Test -l INFO
Bug:
62893665
Change-Id: Ic979964bff9c2240e9d9469238882efa86467399
Fabien Sanglard [Thu, 22 Jun 2017 06:05:32 +0000 (06:05 +0000)]
Merge "Skip Validate am:
11ec393689 am:
a7b0e2785b" into oc-dr1-dev-plus-aosp
am:
1260bdb91d
Change-Id: Ie8b2d0e40b503f2138aa11fdfbffafbab838da3c
Fabien Sanglard [Thu, 22 Jun 2017 06:04:35 +0000 (06:04 +0000)]
Skip Validate am:
11ec393689 am:
47bd6b4a71
am:
3836410494
Change-Id: I7ad33085591fb525ecb3682e591130cf783a20e3
Android Build Merger (Role) [Thu, 22 Jun 2017 06:02:10 +0000 (06:02 +0000)]
Merge "Skip Validate am:
11ec393689 am:
a7b0e2785b" into oc-dr1-dev-plus-aosp
Fabien Sanglard [Thu, 22 Jun 2017 06:01:38 +0000 (06:01 +0000)]
Skip Validate am:
11ec393689
am:
a7b0e2785b
Change-Id: I7d831ce16a35b9c0162c2b08f049fe8a9ce61bbd
Fabien Sanglard [Thu, 22 Jun 2017 06:01:01 +0000 (06:01 +0000)]
Skip Validate am:
11ec393689
am:
47bd6b4a71
Change-Id: Ifb29aa66b104d0162205e81dd58e6f7b65b739ad
Fabien Sanglard [Thu, 22 Jun 2017 05:58:08 +0000 (05:58 +0000)]
Skip Validate
am:
11ec393689
Change-Id: I47c68719ce214ee40ed0e58ec1a0ddc9c14a2b2a
Fabien Sanglard [Thu, 22 Jun 2017 05:57:18 +0000 (05:57 +0000)]
Skip Validate
am:
11ec393689
Change-Id: I6e1121c116d51ad143878ea88f7d33c4af9f9e5b
Fabien Sanglard [Tue, 20 Jun 2017 02:25:31 +0000 (19:25 -0700)]
Skip Validate
b/
37474580
b/
62806392
Test: marlin, ryu
Change-Id: I9d4ece40a8a093d768bcb4edd332cf0188735e66
TreeHugger Robot [Thu, 22 Jun 2017 01:13:43 +0000 (01:13 +0000)]
Merge "Remove toString methods in Vehicle HAL."
sqian [Wed, 21 Jun 2017 21:02:00 +0000 (21:02 +0000)]
Update IRadioResponse.hal documentation am:
6381ac46aa
am:
a255484f25
Change-Id: Id255f8ddf5893cc50648f84c741087c51dd743bc
sqian [Wed, 21 Jun 2017 20:59:30 +0000 (20:59 +0000)]
Update IRadioResponse.hal documentation
am:
6381ac46aa
Change-Id: I78ff5ec68261682a26ec2a208b5dd82097f1f96a
Steven Moreland [Wed, 21 Jun 2017 19:57:02 +0000 (12:57 -0700)]
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
sqian [Fri, 9 Jun 2017 19:10:43 +0000 (12:10 -0700)]
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
Jie Song [Wed, 21 Jun 2017 02:01:37 +0000 (02:01 +0000)]
Merge "Update hash and VTS for the 2nd FD of dumpstate" into oc-dr1-dev am:
79fb65bb7b
am:
514e9c074e
Change-Id: I3c3246697ec248d08b57beb82b0c9dc97a2b77b1
Jie Song [Wed, 21 Jun 2017 01:56:03 +0000 (01:56 +0000)]
Merge "Update hash and VTS for the 2nd FD of dumpstate" into oc-dr1-dev
am:
79fb65bb7b
Change-Id: Ie20644fd70140817fb67eb361ee382c833728830
TreeHugger Robot [Wed, 21 Jun 2017 01:49:24 +0000 (01:49 +0000)]
Merge "Update hash and VTS for the 2nd FD of dumpstate" into oc-dr1-dev
Shawn Willden [Wed, 21 Jun 2017 01:03:29 +0000 (01:03 +0000)]
Merge "Check return from DeleteKey correctly." into oc-dev am:
c4f859d1b5 am:
18996b5aa5
am:
a45f631f44
Change-Id: Ie1bb36467ab7efea42beb2bc314d5a4ea7f0b90e
Shawn Willden [Wed, 21 Jun 2017 01:03:16 +0000 (01:03 +0000)]
Merge "Check return from DeleteKey correctly." into oc-dev am:
c4f859d1b5 am:
da4568eb18
am:
c0ff380223
Change-Id: Ibdef16931b9d57ce6b6accc7ce4fcb41aefc3238
Shawn Willden [Wed, 21 Jun 2017 01:00:57 +0000 (01:00 +0000)]
Merge "Check return from DeleteKey correctly." into oc-dev am:
c4f859d1b5
am:
18996b5aa5
Change-Id: I36f1108e43c8d07181305bdd6464ecfcc5533b0e
Shawn Willden [Wed, 21 Jun 2017 00:58:33 +0000 (00:58 +0000)]
Merge "Check return from DeleteKey correctly." into oc-dev am:
c4f859d1b5
am:
da4568eb18
Change-Id: I59531a8ca8a0550a9e36ef1b8bb848f616fc153e
Shawn Willden [Wed, 21 Jun 2017 00:54:09 +0000 (00:54 +0000)]
Merge "Check return from DeleteKey correctly." into oc-dev
am:
c4f859d1b5
Change-Id: Id817044028fa9bf060305fa7864d8d89755353dc
Shawn Willden [Wed, 21 Jun 2017 00:54:07 +0000 (00:54 +0000)]
Merge "Check return from DeleteKey correctly." into oc-dev
am:
c4f859d1b5
Change-Id: Ib41e416ab79a56cddbaa61084645f626b4a3b22b
TreeHugger Robot [Wed, 21 Jun 2017 00:45:16 +0000 (00:45 +0000)]
Merge "Check return from DeleteKey correctly." into oc-dev
Martijn Coenen [Tue, 20 Jun 2017 18:53:20 +0000 (18:53 +0000)]
Make camera/drm helper classes available to system. am:
14adc6ebc0
am:
68b03188f3
Change-Id: Id8c0e71639f54b0bfddc27b540791ebbf1297683
Martijn Coenen [Tue, 20 Jun 2017 18:42:19 +0000 (18:42 +0000)]
Make camera/drm helper classes available to system.
am:
14adc6ebc0
Change-Id: I6fd73c6d46245b690fae29edbfd7c8c4d2b5ea81
Jie Song [Tue, 20 Jun 2017 16:58:13 +0000 (09:58 -0700)]
Update hash and VTS for the 2nd FD of dumpstate
Bug:
33820081
Test: Run VTS
Change-Id: I139dfed6edb20fada2676684ab7013daefa69bc8
Martijn Coenen [Tue, 20 Jun 2017 15:56:12 +0000 (08:56 -0700)]
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
Wyatt Riley [Tue, 20 Jun 2017 11:08:33 +0000 (11:08 +0000)]
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
Wyatt Riley [Tue, 20 Jun 2017 11:08:18 +0000 (11:08 +0000)]
Merge "Clear notification count to handle different flows" into oc-dev am:
fae2852b2b am:
7ab2da1243
am:
0d7937ae51
Change-Id: I0c724ca7a2a967d00495fe3342bb293c35b03631
Android Build Merger (Role) [Tue, 20 Jun 2017 11:06:00 +0000 (11:06 +0000)]
Merge "Merge "Clear notification count to handle different flows" into oc-dev am:
fae2852b2b am:
d50d573be9" into oc-dr1-dev-plus-aosp
Wyatt Riley [Tue, 20 Jun 2017 11:05:47 +0000 (11:05 +0000)]
Merge "Clear notification count to handle different flows" into oc-dev am:
fae2852b2b
am:
7ab2da1243
Change-Id: I9857f2f6d6b783acf6235aa4c88be2e1ad6640cf
Wyatt Riley [Tue, 20 Jun 2017 11:05:47 +0000 (11:05 +0000)]
Merge "Clear notification count to handle different flows" into oc-dev am:
fae2852b2b
am:
d50d573be9
Change-Id: Ic427c48471a0128a35d5f3c9b67f2d6e520681d7
Wyatt Riley [Tue, 20 Jun 2017 11:03:47 +0000 (11:03 +0000)]
Merge "Clear notification count to handle different flows" into oc-dev
am:
fae2852b2b
Change-Id: I279f8f186304b44b2a1e003deee414d9db09199d
Wyatt Riley [Tue, 20 Jun 2017 11:03:18 +0000 (11:03 +0000)]
Merge "Clear notification count to handle different flows" into oc-dev
am:
fae2852b2b
Change-Id: I5b621ce7b89e8853dbb9abd2e14ec1020176936b
TreeHugger Robot [Tue, 20 Jun 2017 10:59:01 +0000 (10:59 +0000)]
Merge "Clear notification count to handle different flows" into oc-dev
Jiyong Park [Tue, 20 Jun 2017 07:22:43 +0000 (07:22 +0000)]
Merge "Move CameraParameters class to android.hardware.camera.common@1.0-helper" into oc-dr1-dev am:
e599e41a1e
am:
3fd2e1c791
Change-Id: Icb180f0e502cc3953cad6584863812892b90b784
Jiyong Park [Tue, 20 Jun 2017 07:20:17 +0000 (07:20 +0000)]
Merge "Move CameraParameters class to android.hardware.camera.common@1.0-helper" into oc-dr1-dev
am:
e599e41a1e
Change-Id: Idb29fad11b1ba3a22c25f44fdf1a3a697a3e35b4
TreeHugger Robot [Tue, 20 Jun 2017 07:17:45 +0000 (07:17 +0000)]
Merge "Move CameraParameters class to android.hardware.camera.common@1.0-helper" into oc-dr1-dev
Jiyong Park [Tue, 20 Jun 2017 03:39:46 +0000 (03:39 +0000)]
Remove dependency to libmediadrm from drm HAL am:
07770c78e1
am:
b62ca88160
Change-Id: Iff522277ba7469c82538168c8342ac20ee90961a
Jiyong Park [Tue, 20 Jun 2017 03:37:16 +0000 (03:37 +0000)]
Remove dependency to libmediadrm from drm HAL
am:
07770c78e1
Change-Id: I9963fa4da5dd779af03fa97b6b008326df216a97
Wyatt Riley [Mon, 19 Jun 2017 21:42:34 +0000 (14:42 -0700)]
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
6ec696b7fed0c597707762a6d5f5ecd709408aae)
Jiyong Park [Mon, 19 Jun 2017 13:06:41 +0000 (22:06 +0900)]
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
Wyatt Riley [Tue, 20 Jun 2017 00:43:02 +0000 (00:43 +0000)]
Merge "Clear notification count to handle different flows" into oc-dr1-dev am:
b0f192f654
am:
256b74bccd
Change-Id: Ib1b8cb68a980a9c65311be6481c506af76fad42a
Wyatt Riley [Tue, 20 Jun 2017 00:35:02 +0000 (00:35 +0000)]
Merge "Clear notification count to handle different flows" into oc-dr1-dev
am:
b0f192f654
Change-Id: Ie93f3d900a424e84848050e8dcd812b0aee75ab5
Jiyong Park [Tue, 20 Jun 2017 00:32:00 +0000 (00:32 +0000)]
Merge "Use libstagefright_foundation_vendor" into oc-dr1-dev am:
ae87d7ddd0
am:
f61381e21d
Change-Id: I8e2be9432327948884464ee05ab422d65da7a349
Peng Xu [Tue, 20 Jun 2017 00:31:42 +0000 (00:31 +0000)]
Zero uninitialized field in conversion and fix vts bug am:
36665b1b3d am:
4be0fc16c8
am:
4ac2dce78c
Change-Id: Ic23a632755a12e181aaba7644a8ede86bce355eb
Peng Xu [Tue, 20 Jun 2017 00:31:26 +0000 (00:31 +0000)]
Zero uninitialized field in conversion and fix vts bug am:
36665b1b3d am:
967de22a44
am:
aebb0da47a
Change-Id: Ib211d7af472edcc6f926ff567be55e5d7bc2d77b
TreeHugger Robot [Tue, 20 Jun 2017 00:26:34 +0000 (00:26 +0000)]
Merge "Clear notification count to handle different flows" into oc-dr1-dev
Jiyong Park [Tue, 20 Jun 2017 00:19:59 +0000 (00:19 +0000)]
Merge "Use libstagefright_foundation_vendor" into oc-dr1-dev
am:
ae87d7ddd0
Change-Id: I5e91898c7147bc1a80cc6a88701837ae42904f08
Peng Xu [Tue, 20 Jun 2017 00:19:30 +0000 (00:19 +0000)]
Zero uninitialized field in conversion and fix vts bug am:
36665b1b3d
am:
4be0fc16c8
Change-Id: I7b121d7076525f822b78a6bee06afc266916a021
Peng Xu [Tue, 20 Jun 2017 00:16:35 +0000 (00:16 +0000)]
Zero uninitialized field in conversion and fix vts bug am:
36665b1b3d
am:
967de22a44
Change-Id: Ib488780518a73cc72dfcc57e7c00116daf8d89ff
TreeHugger Robot [Tue, 20 Jun 2017 00:16:00 +0000 (00:16 +0000)]
Merge "Use libstagefright_foundation_vendor" into oc-dr1-dev
Peng Xu [Tue, 20 Jun 2017 00:09:11 +0000 (00:09 +0000)]
Zero uninitialized field in conversion and fix vts bug
am:
36665b1b3d
Change-Id: Ib9c7e171da1b1acae16cb550dc1ed7d1cc635c77
Peng Xu [Tue, 20 Jun 2017 00:08:44 +0000 (00:08 +0000)]
Zero uninitialized field in conversion and fix vts bug
am:
36665b1b3d
Change-Id: I9c3aa0350b90f52abb12b4c88f10ab43e82ab65b
Wyatt Riley [Mon, 19 Jun 2017 21:42:34 +0000 (14:42 -0700)]
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
Wyatt Riley [Mon, 19 Jun 2017 21:26:40 +0000 (21:26 +0000)]
Merge "Cleaner VTS for wider use" into oc-dr1-dev am:
c127be33b9
am:
d3abdfef62
Change-Id: I5da2d9a21cec8b91e08077967fe2d532fb46d75e
Jesse Hall [Mon, 19 Jun 2017 21:26:21 +0000 (21:26 +0000)]
Revert "Load the gralloc module at library load" am:
5efa773cc1
am:
5652960deb
Change-Id: I501df1b73607a2dc49219292944a855ba7024a48
Wyatt Riley [Mon, 19 Jun 2017 21:09:10 +0000 (21:09 +0000)]
Merge "Cleaner VTS for wider use" into oc-dr1-dev
am:
c127be33b9
Change-Id: I3929837b71d37bac7ffb3833f360ff8208f79458
Jesse Hall [Mon, 19 Jun 2017 21:08:36 +0000 (21:08 +0000)]
Revert "Load the gralloc module at library load"
am:
5efa773cc1
Change-Id: Ib4b3dc414a2ea10aa21cebdb828c9508edc80492
TreeHugger Robot [Mon, 19 Jun 2017 21:01:38 +0000 (21:01 +0000)]
Merge "Cleaner VTS for wider use" into oc-dr1-dev
Peng Xu [Mon, 19 Jun 2017 18:43:24 +0000 (11:43 -0700)]
Zero uninitialized field in conversion and fix vts bug
Zero uninitialized sensor event field to zero to avoid undefined
value being passed to framework.
Correct sensor report type check bug in vts.
Bug:
37793558
Bug:
37710268
Test: sensor vts passes
Change-Id: I5042975fea8fe28ae130367ba083a4e4f4e5657e
Jiyong Park [Thu, 15 Jun 2017 02:22:29 +0000 (11:22 +0900)]
Use libstagefright_foundation_vendor
DRM HAL is a library in vendor. When BOARD_VNDK_VERSION is turned
on, any lib in vendor partition can only link against to other vendor
libs or libs marked as vendor_available:true. This lib is using
libstagefright_foundation and the lib is not available to vendors.
Instead, libstagefright_foundation_vendor is provided as a
vendor-variant of the foundation library. Thus switching to the vendor
variant.
Bug:
37462569
Test: m android.hardware.drm@1.0-impl
Change-Id: Iaee9886f9ba3643e1c19928690bad13c26ac29d7
Jesse Hall [Mon, 19 Jun 2017 18:48:09 +0000 (11:48 -0700)]
Revert "Load the gralloc module at library load"
This reverts commit
33c08a53ac641c9a9e5a6a1ed75cfb924c95258f. Some
gralloc implementations apparently have library initializers (executed
on dlopen) which create anonymous sockets, open device nodes, etc.
which Zygote and some other non-Zygote-child processes that use libui
don't have permissions to do. When the library initializer fails, it
crashes the process.
Reverting this until this initialization code can be made lazy (on
first use of gralloc).
Bug:
62732270
Test: boot fugu to launcher
Steven Moreland [Mon, 19 Jun 2017 18:10:59 +0000 (18:10 +0000)]
Merge "Update makefiles (vibrator open)." into oc-dr1-dev am:
8dc55df186
am:
75509e4e94
Change-Id: Id31dc0d2ca241a13440118f3c2d1c42ab7f09adb
Steven Moreland [Mon, 19 Jun 2017 17:59:27 +0000 (17:59 +0000)]
Merge "Update makefiles (vibrator open)." into oc-dr1-dev
am:
8dc55df186
Change-Id: I258ed67061952467cf81ee69b58d2f68c7f337e1
TreeHugger Robot [Mon, 19 Jun 2017 17:45:18 +0000 (17:45 +0000)]
Merge "Update makefiles (vibrator open)." into oc-dr1-dev
Ruchi Kandoi [Mon, 19 Jun 2017 16:50:49 +0000 (16:50 +0000)]
Merge "Merge "Nfc: Vts: modify WriteInvalidAndThenValidCommand" into oc-dev am:
55f3ddf53b am:
d56f85aded" into oc-dr1-dev-plus-aosp
am:
b1ea3006ac
Change-Id: Ic3918bc533945300d528e2c5656fda277e73c07d
Ruchi Kandoi [Mon, 19 Jun 2017 16:50:33 +0000 (16:50 +0000)]
Merge "Nfc: Vts: modify WriteInvalidAndThenValidCommand" into oc-dev am:
55f3ddf53b am:
ec553ff9a7
am:
35f0b1bd8d
Change-Id: Ic1e36b95e5842e513345a47c2dfd4e50286b01ef
Android Build Merger (Role) [Mon, 19 Jun 2017 16:45:46 +0000 (16:45 +0000)]
Merge "Merge "Nfc: Vts: modify WriteInvalidAndThenValidCommand" into oc-dev am:
55f3ddf53b am:
d56f85aded" into oc-dr1-dev-plus-aosp
Ruchi Kandoi [Mon, 19 Jun 2017 16:45:33 +0000 (16:45 +0000)]
Merge "Nfc: Vts: modify WriteInvalidAndThenValidCommand" into oc-dev am:
55f3ddf53b
am:
ec553ff9a7
Change-Id: I627e9c2e609406f332a499c6914a18974a0e1478
Ruchi Kandoi [Mon, 19 Jun 2017 16:45:33 +0000 (16:45 +0000)]
Merge "Nfc: Vts: modify WriteInvalidAndThenValidCommand" into oc-dev am:
55f3ddf53b
am:
d56f85aded
Change-Id: I19ab3dd4f1ef9d786c82c40962c7c294c23be9fc
Ruchi Kandoi [Mon, 19 Jun 2017 16:39:05 +0000 (16:39 +0000)]
Merge "Nfc: Vts: modify WriteInvalidAndThenValidCommand" into oc-dev
am:
55f3ddf53b
Change-Id: I4a925e2c92572b20e85b8a6604d3af6e7f8f30ea
Ruchi Kandoi [Mon, 19 Jun 2017 16:39:03 +0000 (16:39 +0000)]
Merge "Nfc: Vts: modify WriteInvalidAndThenValidCommand" into oc-dev
am:
55f3ddf53b
Change-Id: I206c37983b9508aff0424cd01ba1b0c08c5584a1
Ruchi Kandoi [Mon, 19 Jun 2017 16:33:33 +0000 (16:33 +0000)]
Merge "Nfc: Vts: modify WriteInvalidAndThenValidCommand" into oc-dev
Steven Moreland [Sat, 17 Jun 2017 02:52:49 +0000 (19:52 -0700)]
Update makefiles (vibrator open).
Vibrator was missing default module flags.
Test: none
Change-Id: I77594843a876f9e424f201174e220a6d3b45b271
Bailey Forrest [Sat, 17 Jun 2017 02:12:30 +0000 (02:12 +0000)]
Merge "Include missing headers" am:
1bbe51d0b5 am:
9cf1bbb045 am:
92863322a5
am:
63003a3d38
Change-Id: I12dee2fcdf29712e1da39f6905e80228e3b0c53b
TreeHugger Robot [Sat, 17 Jun 2017 01:34:35 +0000 (01:34 +0000)]
Merge "bug fix: configure output port frame dimensions"
Bailey Forrest [Sat, 17 Jun 2017 00:26:11 +0000 (00:26 +0000)]
Merge "Include missing headers" am:
1bbe51d0b5 am:
9cf1bbb045
am:
92863322a5
Change-Id: Ieed4e62a8046212eeb3afc0dd3b659d6c0fe4fff
Bailey Forrest [Sat, 17 Jun 2017 00:22:10 +0000 (00:22 +0000)]
Merge "Include missing headers" am:
1bbe51d0b5
am:
9cf1bbb045
Change-Id: I37f592401697c92115eea0ca33eea4170f549712
Bailey Forrest [Sat, 17 Jun 2017 00:15:09 +0000 (00:15 +0000)]
Merge "Include missing headers"
am:
1bbe51d0b5
Change-Id: I7e859a2afadd4c5221f07901fdff0d9715e0d285
Treehugger Robot [Sat, 17 Jun 2017 00:09:20 +0000 (00:09 +0000)]
Merge "Include missing headers"
Ram Mohan M [Thu, 15 Jun 2017 10:29:12 +0000 (15:59 +0530)]
bug fix: configure output port frame dimensions
frame dimensions are configured for input port but not output port.
As a result in qcom encoder components, the encoded image is getting
downsized to default dimensions configured for output port. This is now
corrected.
Test: make vts -j30 BUILD_GOOGLE_VTS=true TARGET_PRODUCT=aosp_arm64 &&
vts-tradefed run commandAndExit vts --skip-all-system-status-check
--primary-abi-only --skip-preconditions --module VtsHalMediaOmxV1_0Test
-l INFO
Bug:
62669756
Change-Id: Ib38006edbc82427d322632534ca78d78c5f30eff
Jesse Hall [Fri, 16 Jun 2017 23:06:44 +0000 (23:06 +0000)]
Merge "Load the gralloc module at library load" into oc-dr1-dev am:
96a81c3347
am:
d872469532
Change-Id: Ia8158bfa679ecbacc533a715163a3f4f6f302dd5
nharold [Fri, 16 Jun 2017 23:05:42 +0000 (23:05 +0000)]
Merge "Radio Keepalive HAL" am:
95f0176afa am:
3ed4ff9c74 am:
9739017198
am:
e7362178e2
Change-Id: I905852562f6ff28ac8ff5bd214ac4abeb3f60365
OSDN Git Service
