OSDN Git Service
Shuo Qian [Thu, 29 Jun 2017 03:33:56 +0000 (03:33 +0000)]
Merge "Fix failure vts tests:" into oc-dr1-dev
am:
55967b136e
Change-Id: Ie4131520b9d5915cccd7ef57b3063c7b5e3bf1c5
Shuo Qian [Thu, 29 Jun 2017 03:28:46 +0000 (03:28 +0000)]
Merge "Fix failure vts tests:" into oc-dr1-dev
Shuo Qian [Thu, 29 Jun 2017 02:53:23 +0000 (02:53 +0000)]
Merge "Add a new vts directory under 1.1 for radio 1.1 APIs vts tests." into oc-dr1-dev
am:
00eb34b57a
Change-Id: I491d9ce3eb219ae2bd8b9988b0ca5d20b1d80144
Shuo Qian [Thu, 29 Jun 2017 02:41:57 +0000 (02:41 +0000)]
Merge "Add a new vts directory under 1.1 for radio 1.1 APIs vts tests." into oc-dr1-dev
Connor O'Brien [Thu, 29 Jun 2017 02:29:16 +0000 (02:29 +0000)]
Merge "Fix consumerir test bugs" into oc-dev am:
9f0b8369e9
am:
989bd639b2
Change-Id: I700a2f280fea76a480c16a6f2ff40fc15a8c362e
Connor O'Brien [Thu, 29 Jun 2017 02:21:17 +0000 (02:21 +0000)]
Merge "Fix consumerir test bugs" into oc-dev
am:
9f0b8369e9
Change-Id: Ib8949fe95c3f02cc951f357e0f6cbae154e31d95
Connor O'Brien [Thu, 29 Jun 2017 02:17:46 +0000 (02:17 +0000)]
Merge "Fix consumerir test bugs" into oc-dev am:
9f0b8369e9
am:
601ae82ebc
Change-Id: I2853357573153e2a0af5b3a61b9b7042cb950219
Connor O'Brien [Thu, 29 Jun 2017 02:15:16 +0000 (02:15 +0000)]
Merge "Fix consumerir test bugs" into oc-dev
am:
9f0b8369e9
Change-Id: I6e28e41595743e614a4f10f6e014673edc4c4bad
Connor O'Brien [Thu, 29 Jun 2017 02:06:23 +0000 (02:06 +0000)]
Merge "Fix consumerir test bugs" into oc-dev
Emilian Peev [Thu, 29 Jun 2017 01:56:03 +0000 (01:56 +0000)]
Merge "Camera: Add support for testing partial results" into oc-dev am:
98b7dd57dc -s ours
am:
a69d5bbc4e -s ours
Change-Id: Ibf2f84e9b869ac21d76fa0abcfb066c43dbd309b
Emilian Peev [Thu, 29 Jun 2017 01:52:18 +0000 (01:52 +0000)]
Merge "Camera: Add support for testing partial results" into oc-dev am:
98b7dd57dc
am:
ed0a5d2eba -s ours
Change-Id: I64e388601fd728d452153bdcb29533e3b5e1458d
Emilian Peev [Thu, 29 Jun 2017 01:48:49 +0000 (01:48 +0000)]
Merge "Camera: Add support for testing partial results" into oc-dev
am:
98b7dd57dc
Change-Id: If210f365f31053c718aee550d1a3e8d6432ff97b
Emilian Peev [Thu, 29 Jun 2017 01:48:47 +0000 (01:48 +0000)]
Merge "Camera: Add support for testing partial results" into oc-dev
am:
98b7dd57dc -s ours
Change-Id: I8301d4bb4ec160018865bab5109013809202af80
TreeHugger Robot [Thu, 29 Jun 2017 01:46:13 +0000 (01:46 +0000)]
Merge "Camera: Add support for testing partial results" into oc-dev
Connor O'Brien [Wed, 28 Jun 2017 23:46:43 +0000 (16:46 -0700)]
Fix consumerir test bugs
The tests currently fail for some correct implementations; revise them
so this no longer occurs.
Bug:
63081607
Test: built & ran revised test
Change-Id: I21b72fd864de57272bd6eb42dca238f661137b93
Signed-off-by: Connor O'Brien <connoro@google.com>
sqian [Fri, 23 Jun 2017 23:37:32 +0000 (16:37 -0700)]
Fix failure vts tests:
- setCdmaBroadcastConfig
- getCdmaBroadcastConfig
- setCdmaBroadcastActivation
- pullLceData
- setAllowedCarriers
- setAllowedCarriers
- sendEnvelope
- sendEnvelopeWithStatus
- cancelPendingUssd
- sendCDMAFeatureCode
Test: mma -j30; adb shell binary
Bug:
62960543,
62584347
Change-Id: Ie907cdb464a44d92be47d898151d71eb2d83a11c
Merged-In: Ie907cdb464a44d92be47d898151d71eb2d83a11c
sqian [Wed, 24 May 2017 22:08:25 +0000 (15:08 -0700)]
Add a new vts directory under 1.1 for radio 1.1 APIs vts tests.
Bug:
38034125
Test: compile; adb shell compiled_vts_binary
Change-Id: I05d4f03db40ac712f120ac0e3e52301a6252f041
Yahan Zhou [Wed, 28 Jun 2017 17:37:11 +0000 (17:37 +0000)]
Merge "Fix ICryptoFactory service" into oc-dev am:
2c57b00b17
am:
bd0c79c262
Change-Id: Ieaa270136b316cda710331f4afe4dd74639fdbdd
Yahan Zhou [Wed, 28 Jun 2017 17:33:39 +0000 (17:33 +0000)]
Merge "Fix ICryptoFactory service" into oc-dev am:
2c57b00b17
am:
ef38715ba3
Change-Id: Iebc7405f6603c2838ecaa917357eb81a977f140c
Yahan Zhou [Wed, 28 Jun 2017 17:30:40 +0000 (17:30 +0000)]
Merge "Fix ICryptoFactory service" into oc-dev
am:
2c57b00b17
Change-Id: I81cb1a353e63fea48f69e2fc522f70b63a1e8532
Yahan Zhou [Wed, 28 Jun 2017 17:30:40 +0000 (17:30 +0000)]
Merge "Fix ICryptoFactory service" into oc-dev
am:
2c57b00b17
Change-Id: If739ab2d5a5c93ddd2bb8720305311ee49a5503d
Yahan Zhou [Wed, 28 Jun 2017 17:27:20 +0000 (17:27 +0000)]
Merge "Fix ICryptoFactory service" into oc-dev
Emilian Peev [Wed, 28 Jun 2017 16:48:07 +0000 (16:48 +0000)]
Merge "Camera: Try to test additional types of camera providers" into oc-dr1-dev
am:
c68231d171
Change-Id: I123b8b3f5be22b72401cc609d9bb2da8875b9897
TreeHugger Robot [Wed, 28 Jun 2017 16:44:24 +0000 (16:44 +0000)]
Merge "Camera: Try to test additional types of camera providers" into oc-dr1-dev
pkanwar [Wed, 28 Jun 2017 05:18:42 +0000 (05:18 +0000)]
Radio Interface changes to allow the modem to query the framework for the key.
am:
fc5f3558fe -s ours
Change-Id: I115c93bb5523f112cd35870d4b6db3d5d5c65b0c
pkanwar [Sun, 21 May 2017 17:22:02 +0000 (10:22 -0700)]
Radio Interface changes to allow the modem to query the framework
for the key.
We will now pass the ImsiEncryptionInfo object which includes mnc/mcc.
BUG:
35606429
Test: manual
Merged-In: Iae18382f1f244be6a756a47753f0345e1925ca4a
Change-Id: Iae18382f1f244be6a756a47753f0345e1925ca4a
Nathan Harold [Tue, 27 Jun 2017 08:35:04 +0000 (01:35 -0700)]
Merge commit '
bf7dcd2a' into oc-dr1-dev-plus-aosp
Change-Id: Ic64fbf4782e129e15f0edbe2db810e81b04acd82
TreeHugger Robot [Tue, 27 Jun 2017 08:13:34 +0000 (08:13 +0000)]
Merge "Radio Keepalive HAL" into oc-dr1-dev
Emilian Peev [Wed, 21 Jun 2017 13:52:54 +0000 (14:52 +0100)]
Camera: Try to test additional types of camera providers
Check whether different types of camera providers got
registered and try to test them if present.
Bug:
62835396
Test: vts-tradefed run commandAndExit vts --skip-all-system-status-check
--skip-preconditions --module VtsHalCameraProviderV2_4Target -l INFO
Change-Id: I5c0c678e74d56cd8307d2f4e63b7c6dfa95d210d
Emilian Peev [Tue, 23 May 2017 15:37:11 +0000 (16:37 +0100)]
Camera: Add support for testing partial results
Currently the result handling is very basic. Partial
results and inflight queues are not supported. More
elaborate test cases like burst or streaming will
require such functionality to be present.
Merged-In: I3769d4ccc0047dc4eda173ea3bca538b026be8d2
Bug:
62550376
Bug:
37533777
Test: adb shell
/data/nativetest/VtsHalCameraProviderV2_4TargetTest/VtsHalCameraProviderV2_4TargetTest
Change-Id: I3769d4ccc0047dc4eda173ea3bca538b026be8d2
Emilian Peev [Mon, 26 Jun 2017 18:50:43 +0000 (18:50 +0000)]
Merge "Camera: Add support for testing partial results" into oc-dr1-dev
am:
c60ec1c2ac
Change-Id: I6fac06fbe7f60712877933dc05fe10e256f705b1
TreeHugger Robot [Mon, 26 Jun 2017 18:42:46 +0000 (18:42 +0000)]
Merge "Camera: Add support for testing partial results" into oc-dr1-dev
Steven Moreland [Mon, 26 Jun 2017 17:59:20 +0000 (17:59 +0000)]
Merge "Use vendor variant of libstagefright_foundation." into oc-dr1-dev
am:
424a4be6b1
Change-Id: Iea3484f0926f9792744e552b39976992111260ab
TreeHugger Robot [Mon, 26 Jun 2017 17:54:11 +0000 (17:54 +0000)]
Merge "Use vendor variant of libstagefright_foundation." into oc-dr1-dev
bohu [Sat, 24 Jun 2017 02:33:44 +0000 (02:33 +0000)]
vts: fix TryDifferentGovernors in Power hal test am:
ae96eee82b
am:
9165643690
Change-Id: I74bcbf7a7cae58c7b3b120ed8ae75fe300506edc
bohu [Sat, 24 Jun 2017 02:17:15 +0000 (02:17 +0000)]
vts: fix TryDifferentGovernors in Power hal test am:
ae96eee82b
am:
69dc5c836f
Change-Id: Id006b7a46d42d87091aed336d19e2aa3ff7f3f45
bohu [Sat, 24 Jun 2017 02:10:23 +0000 (02:10 +0000)]
vts: fix TryDifferentGovernors in Power hal test
am:
ae96eee82b
Change-Id: Iaa383d8d150b8b633c3d238c52622fddc0d3ec09
bohu [Sat, 24 Jun 2017 02:09:26 +0000 (02:09 +0000)]
vts: fix TryDifferentGovernors in Power hal test
am:
ae96eee82b
Change-Id: I700de5db71fb60b33983309d8d71a672dd2f98a3
bohu [Fri, 23 Jun 2017 19:31:42 +0000 (12:31 -0700)]
vts: fix TryDifferentGovernors in Power hal test
The test should return when it cannot open cpu governor files
BUG:
62138092
Test: build sdk_gphone_x86-userdebug, launch emulator,
run test: run vts -m VtsHalPowerV1_0Target
The test should all pass.
Change-Id: I3b47261e9525b6a04e995dac1ad63d9cc088b004
Android Build Merger (Role) [Fri, 23 Jun 2017 18:05:11 +0000 (18:05 +0000)]
Merge "Merge "Camera: fix recursive lock in CameraDevice 1.0" into oc-dev am:
eed6653f2a am:
2ff1f7e687" into oc-dr1-dev-plus-aosp
Yahan Zhou [Fri, 23 Jun 2017 18:04:56 +0000 (18:04 +0000)]
Merge "Camera: fix recursive lock in CameraDevice 1.0" into oc-dev am:
eed6653f2a
am:
2ff1f7e687
Change-Id: I0cf1590eadb4965c03474ded10898a40af344755
Yahan Zhou [Fri, 23 Jun 2017 18:04:55 +0000 (18:04 +0000)]
Merge "Camera: fix recursive lock in CameraDevice 1.0" into oc-dev am:
eed6653f2a
am:
a61c24c091
Change-Id: I3144fd4dd59d909fb503b2accce70719f6c150b2
Yahan Zhou [Fri, 23 Jun 2017 17:59:26 +0000 (17:59 +0000)]
Merge "Camera: fix recursive lock in CameraDevice 1.0" into oc-dev
am:
eed6653f2a
Change-Id: Ia962664983096059da8ecbffa7f13ef525e4a6e4
Yahan Zhou [Fri, 23 Jun 2017 17:59:25 +0000 (17:59 +0000)]
Merge "Camera: fix recursive lock in CameraDevice 1.0" into oc-dev
am:
eed6653f2a
Change-Id: I66f434944d2a00bee6c06d0883b916c5c87d1243
TreeHugger Robot [Fri, 23 Jun 2017 17:51:15 +0000 (17:51 +0000)]
Merge "Camera: fix recursive lock in CameraDevice 1.0" into oc-dev
Steven Moreland [Fri, 23 Jun 2017 17:23:57 +0000 (17:23 +0000)]
Merge "Remove toString methods in Vehicle HAL." into oc-dev-plus-aosp
am:
990b076833
Change-Id: If04916713fd01e6b0b98f24d72ce684e83a3dfd0
Steven Moreland [Fri, 23 Jun 2017 17:14:01 +0000 (17:14 +0000)]
Merge "Remove toString methods in Vehicle HAL." into oc-dev-plus-aosp
Android Build Merger (Role) [Fri, 23 Jun 2017 15:44:31 +0000 (15:44 +0000)]
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
Shawn Willden [Fri, 23 Jun 2017 15:44:17 +0000 (15:44 +0000)]
Merge "Test import of a EC P-521 key." into oc-dev am:
ad40c6ccd7
am:
6715433ca7 -s ours
Change-Id: Ia83c6188b1cec97b442016c156e4550a0254604e
Shawn Willden [Fri, 23 Jun 2017 15:44:17 +0000 (15:44 +0000)]
Merge "Test import of a EC P-521 key." into oc-dev am:
ad40c6ccd7 -s ours
am:
3ac476c241 -s ours
Change-Id: I276e2a9e81425f93ab2ce1f9115b4863f6930049
Shawn Willden [Fri, 23 Jun 2017 15:39:19 +0000 (15:39 +0000)]
Merge "Test import of a EC P-521 key." into oc-dev
am:
ad40c6ccd7
Change-Id: I42bd0035153a5312b4654ec8b27f6ad6589d56e1
Shawn Willden [Fri, 23 Jun 2017 15:39:17 +0000 (15:39 +0000)]
Merge "Test import of a EC P-521 key." into oc-dev
am:
ad40c6ccd7 -s ours
Change-Id: I725a855d206b47df230529fefb9ff99197ac23c8
TreeHugger Robot [Fri, 23 Jun 2017 15:32:14 +0000 (15:32 +0000)]
Merge "Test import of a EC P-521 key." into oc-dev
Etan Cohen [Fri, 23 Jun 2017 12:48:26 +0000 (12:48 +0000)]
Merge "[WIFI] Remove dependency on vendor-specific library" into oc-dev am:
74f7ccd680 -s ours
am:
ef0bc81641 -s ours
Change-Id: Ib974d20a6b8b8c4bdd5f8d153bcf4840d3cc317a
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
Etan Cohen [Fri, 23 Jun 2017 05:03:40 +0000 (05:03 +0000)]
Merge "[WIFI] Remove dependency on vendor-specific library" into oc-dev
am:
74f7ccd680 -s ours
Change-Id: I1c1900868023a031c25d60095454c224fe60ac72
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
Yahan Zhou [Fri, 23 Jun 2017 00:04:41 +0000 (17:04 -0700)]
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
Steven Moreland [Fri, 23 Jun 2017 00:11:09 +0000 (17:11 -0700)]
Use vendor variant of libstagefright_foundation.
Rather than having a lib called libstagefright_foundation and one
called libstagefright_foundation_vendor, we now just have one library
and the build system keeps track of the vendor APIs that are exposed.
Test: (sanity) boot device, watch (part of) DRM protected movie.
Change-Id: I7495be3e8f546cac1b4909108313cf61fc85b1d8
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
Nathan Harold [Thu, 25 May 2017 02:42:40 +0000 (19:42 -0700)]
Radio Keepalive HAL
This adds support for offloading of keepalive packets
to the radio for reduced power consumption.
Bug:
33277538
Test: none
Change-Id: I8e8a841e25f18afeae07f70024c698efa58263e2
(cherry picked from commit
4e2541ecc6d9d57f424bd477a1907a896de497f0)
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.
Merged-In: Ia7654ff8813942fbca9dfa838337e9de5839a9e2
Bug:
33945114
Test: adb shell data/nativetests64/VtsHalKeymasterV3_0TargetTest/VtsHalKeymasterV3_0TargetTest
Change-Id: Ia7654ff8813942fbca9dfa838337e9de5839a9e2
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: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
Yahan Zhou [Wed, 21 Jun 2017 21:24:09 +0000 (14:24 -0700)]
Fix ICryptoFactory service
BUG:
62642564
BUG:
62138343
Test: vts -m VtsHalDrmV1_0Target
Change-Id: Ic697a32b111804fc3dc78f1b6e6b77538d7eeea9
(cherry picked from commit
85a5d8855b07aec3727532983de38c324960d6d1)
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
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
Merged-In: I522630267beb7f87713a0a54c1ecb38077dc1b4e
Change-Id: I522630267beb7f87713a0a54c1ecb38077dc1b4e
sqian [Wed, 21 Jun 2017 20:59:30 +0000 (20:59 +0000)]
Update IRadioResponse.hal documentation
am:
6381ac46aa
Change-Id: I78ff5ec68261682a26ec2a208b5dd82097f1f96a
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
Emilian Peev [Tue, 23 May 2017 15:37:11 +0000 (16:37 +0100)]
Camera: Add support for testing partial results
Currently the result handling is very basic. Partial
results and inflight queues are not supported. More
elaborate test cases like burst or streaming will
require such functionality to be present.
Bug:
62550376
Bug:
37533777
Test: adb shell
/data/nativetest/VtsHalCameraProviderV2_4TargetTest/VtsHalCameraProviderV2_4TargetTest
Change-Id: I3769d4ccc0047dc4eda173ea3bca538b026be8d2
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: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: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
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: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: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
OSDN Git Service
