OSDN Git Service
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
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 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
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 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"
Jesse Hall [Fri, 16 Jun 2017 22:53:38 +0000 (22:53 +0000)]
Merge "Load the gralloc module at library load" into oc-dr1-dev
am:
96a81c3347
Change-Id: I31604be377e61becdbbb72c4ab2a556491c2de90
nharold [Fri, 16 Jun 2017 22:46:29 +0000 (22:46 +0000)]
Merge "Radio Keepalive HAL" am:
95f0176afa am:
3ed4ff9c74
am:
9739017198
Change-Id: I93fe3fc25dae79cce238fd2858d620cd604b4e93
Ruchi Kandoi [Fri, 16 Jun 2017 22:46:09 +0000 (22:46 +0000)]
Nfc: Vts: modify WriteInvalidAndThenValidCommand am:
a915c5a240 am:
fe5dd5731e
am:
155d748f79
Change-Id: I5543dea7aae76ed520293f8a11d4c21dc1378a19
Jesse Hall [Fri, 16 Jun 2017 22:45:37 +0000 (22:45 +0000)]
Merge "Load the gralloc module at library load" into oc-dr1-dev
nharold [Fri, 16 Jun 2017 22:43:33 +0000 (22:43 +0000)]
Merge "Radio Keepalive HAL" am:
95f0176afa
am:
3ed4ff9c74
Change-Id: Ie749848ad85b1d35b94f0bd02771dad684117005
nharold [Fri, 16 Jun 2017 22:41:35 +0000 (22:41 +0000)]
Merge "Radio Keepalive HAL"
am:
95f0176afa
Change-Id: I034a6028efeedcccf94aaefb0a970a8384ae85ae
nharold [Fri, 16 Jun 2017 22:37:19 +0000 (22:37 +0000)]
Merge "Radio Keepalive HAL"
Ruchi Kandoi [Fri, 16 Jun 2017 22:35:58 +0000 (22:35 +0000)]
Nfc: Vts: modify WriteInvalidAndThenValidCommand am:
a915c5a240
am:
fe5dd5731e
Change-Id: I9721de547efb1c3017bb014f6932f1c9c873e9f8
Ruchi Kandoi [Fri, 16 Jun 2017 22:33:57 +0000 (22:33 +0000)]
Nfc: Vts: modify WriteInvalidAndThenValidCommand
am:
a915c5a240
Change-Id: I4cbaebb15af6c7df3e145b8340936bb43c332468
Ruchi Kandoi [Thu, 15 Jun 2017 20:22:51 +0000 (13:22 -0700)]
Nfc: Vts: modify WriteInvalidAndThenValidCommand
Invalid Data packets are ignored by the NFC controller in case there
isn't an active RF Interface. The test expects response for the invalid
data packet without any active RF Interface. This patch modifies the
test to send an invalid command instead which will guarantee a response.
Test: run vts test
Bug:
62400568
Change-Id: I7db1d5209b6ef2240ac248f3aba0e27e0a285018
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
Yin-Chia Yeh [Fri, 16 Jun 2017 19:53:51 +0000 (19:53 +0000)]
Merge "Camera: fix camera_metadata address expectation" into oc-dev am:
e812feb56f
am:
8bc10783a9
Change-Id: I07aeb6ed59e9a017ea0fd7bf80a3fbc6c5767bf3
Ruchi Kandoi [Thu, 15 Jun 2017 20:22:51 +0000 (13:22 -0700)]
Nfc: Vts: modify WriteInvalidAndThenValidCommand
Invalid Data packets are ignored by the NFC controller in case there
isn't an active RF Interface. The test expects response for the invalid
data packet without any active RF Interface. This patch modifies the
test to send an invalid command instead which will guarantee a response.
Test: run vts test
Bug:
62400568
Change-Id: I7db1d5209b6ef2240ac248f3aba0e27e0a285018
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
(cherry picked from commit
c86df4dcb74224ea7befc2cb610e43d0df6814ae)
Yin-Chia Yeh [Fri, 16 Jun 2017 19:51:21 +0000 (19:51 +0000)]
Merge "Camera: fix camera_metadata address expectation" into oc-dev am:
e812feb56f
am:
1ea71cc4f2
Change-Id: I03ddf0ff1dd0e0a8342cb8fc097bdf27ee15b044
Yin-Chia Yeh [Fri, 16 Jun 2017 19:40:12 +0000 (19:40 +0000)]
Merge "Camera: fix camera_metadata address expectation" into oc-dev
am:
e812feb56f
Change-Id: I9142f4bb7a55f9c1e6547a038b21f7cbb4e5adba
Yin-Chia Yeh [Fri, 16 Jun 2017 19:37:00 +0000 (19:37 +0000)]
Merge "Camera: fix camera_metadata address expectation" into oc-dev
am:
e812feb56f
Change-Id: Id3e433048cf25e8c50aa20e97dca6e3112f0fb57
TreeHugger Robot [Fri, 16 Jun 2017 19:22:04 +0000 (19:22 +0000)]
Merge "Camera: fix camera_metadata address expectation" into oc-dev
Jesse Hall [Wed, 7 Jun 2017 21:37:34 +0000 (14:37 -0700)]
Load the gralloc module at library load
In the a.h.graphics.mapper default implementation, load the gralloc
module in a static constructor that runs when the library is loaded.
This causes Zygote to load the gralloc module and its dependencies
when it loads a.h.graphics.mapper, so that it doesn't have to be
loaded during each activity launch.
Bug:
62353585
Test: boot to launcher, run calculator, confirm gralloc library is in
/proc/`pid zygote64`/maps
Change-Id: I56defd76b0ba0fba71dea48e2b0d338511563d1f
Ruchi Kandoi [Fri, 16 Jun 2017 00:19:16 +0000 (00:19 +0000)]
Merge "Support NCI 2.0 for NFC VTS" am:
7b62681f43 am:
8f517e1e56
am:
f8471253fa
Change-Id: Ia7ac4815e12116330932fe7d5bd8dfb4d92a9d08
Etan Cohen [Fri, 16 Jun 2017 00:16:18 +0000 (00:16 +0000)]
Merge "[AWARE] Actually shut-down functionality when destroying NAN iface" into oc-dr1-dev
am:
9424e9d541
Change-Id: Ia6990c90e8ffc17f2a88815d0cd53ac7dbffba31
Ruchi Kandoi [Fri, 16 Jun 2017 00:13:16 +0000 (00:13 +0000)]
Merge "Support NCI 2.0 for NFC VTS" am:
7b62681f43
am:
8f517e1e56
Change-Id: I7835d8d3213f031b115e838d1e0f819069251ca2
Ruchi Kandoi [Fri, 16 Jun 2017 00:09:45 +0000 (00:09 +0000)]
Merge "Support NCI 2.0 for NFC VTS"
am:
7b62681f43
Change-Id: Ic46b40b4e9cb053ea9bb8af7a0bbdfe79fdb1a17
TreeHugger Robot [Fri, 16 Jun 2017 00:04:36 +0000 (00:04 +0000)]
Merge "[AWARE] Actually shut-down functionality when destroying NAN iface" into oc-dr1-dev
Treehugger Robot [Fri, 16 Jun 2017 00:02:13 +0000 (00:02 +0000)]
Merge "Support NCI 2.0 for NFC VTS"
Android Build Merger (Role) [Thu, 15 Jun 2017 23:09:55 +0000 (23:09 +0000)]
Merge "Merge "Support NCI 2.0 for NFC VTS" into oc-dev am:
5ed63181a9 am:
ada528db46" into oc-dr1-dev-plus-aosp
Ruchi Kandoi [Thu, 15 Jun 2017 23:09:40 +0000 (23:09 +0000)]
Merge "Support NCI 2.0 for NFC VTS" into oc-dev am:
5ed63181a9
am:
ccccc15034
Change-Id: I1d3968fd5178b90e05a7ace963d27105d01c16d6
Ruchi Kandoi [Thu, 15 Jun 2017 23:09:40 +0000 (23:09 +0000)]
Merge "Support NCI 2.0 for NFC VTS" into oc-dev am:
5ed63181a9
am:
ada528db46
Change-Id: I54af85474cbb99d19f3f6e345a62a31eb076e1cb
Ruchi Kandoi [Thu, 15 Jun 2017 23:06:12 +0000 (23:06 +0000)]
Merge "Support NCI 2.0 for NFC VTS" into oc-dev
am:
5ed63181a9
Change-Id: I65cd9c3d9818871130eea5351f02d655bac44988
Ruchi Kandoi [Thu, 15 Jun 2017 23:06:10 +0000 (23:06 +0000)]
Merge "Support NCI 2.0 for NFC VTS" into oc-dev
am:
5ed63181a9
Change-Id: Ibf9ee2479402f9d2f76d3cdd936ab52df39b3538
Ruchi Kandoi [Thu, 15 Jun 2017 22:59:23 +0000 (22:59 +0000)]
Merge "Support NCI 2.0 for NFC VTS" into oc-dev
Yin-Chia Yeh [Thu, 15 Jun 2017 00:29:47 +0000 (17:29 -0700)]
Camera: fix camera_metadata address expectation
On 32bits architecture, binder driver might allocate
non-8 bytes aligned buffers.
Test: compile (problem not reproducible on 64bit SOCs)
Bug:
62637461
Change-Id: I8ef2b3ecba783a8d189ebe18733082d32cff4899
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
Etan Cohen [Thu, 15 Jun 2017 15:39:23 +0000 (08:39 -0700)]
[AWARE] Actually shut-down functionality when destroying NAN iface
Destroying the interface doesn't actually execute any functions on
the legacy HAL - i.e. on the HAL side. This may leave state around -
a problem when next "re-enabling" the interface as well as possibly
a power issue.
Add code to actually disable Aware and to destroy interfaces. There
is no need to check on current status since calls will simply fail
quietly if there's nothing to disable and nothing to destroy.
Bug:
62632805
Test: integration non-concurrence test cases NonConcurrencyTest
Change-Id: I11e5bd6f3ed47f6d709ff360c9f4adf5f40234a5
Chih-hung Hsieh [Wed, 14 Jun 2017 22:35:30 +0000 (22:35 +0000)]
Merge "Add OWNERS in hardware/interfaces" am:
37e00854d9 am:
e79bededad
am:
ddbc0a30e8
Change-Id: I284492b42976225b78baa08b43455313b51aa7fa
Chih-hung Hsieh [Wed, 14 Jun 2017 22:32:59 +0000 (22:32 +0000)]
Merge "Add OWNERS in hardware/interfaces" am:
37e00854d9
am:
e79bededad
Change-Id: Icd80852815f954e839702753fa8288b476df9d05
Chih-hung Hsieh [Wed, 14 Jun 2017 22:30:29 +0000 (22:30 +0000)]
Merge "Add OWNERS in hardware/interfaces"
am:
37e00854d9
Change-Id: I3574e1f347368d146812cd86116dbaa85e216e97
Chih-hung Hsieh [Wed, 14 Jun 2017 22:25:55 +0000 (22:25 +0000)]
Merge "Add OWNERS in hardware/interfaces"
Janis Danisevskis [Wed, 14 Jun 2017 02:37:05 +0000 (02:37 +0000)]
Merge "Purge unsupported RSA key sizes from VTS tests" into oc-dev am:
bc970b089f
am:
324ffd65ee
Change-Id: I6aa7c56f57af10c06a02af64ad56abab249fdbb2
Janis Danisevskis [Wed, 14 Jun 2017 02:36:40 +0000 (02:36 +0000)]
Merge "Purge unsupported RSA key sizes from VTS tests" into oc-dev am:
bc970b089f
am:
eb5a6056bc
Change-Id: Ie818759949e967cef8b5da599cce004e42dbd837
Janis Danisevskis [Wed, 14 Jun 2017 02:32:40 +0000 (02:32 +0000)]
Merge "Purge unsupported RSA key sizes from VTS tests" into oc-dev
am:
bc970b089f
Change-Id: Id5c16a9a8a2ff95e18254da4b8568d68e15e5834
Janis Danisevskis [Wed, 14 Jun 2017 02:32:40 +0000 (02:32 +0000)]
Merge "Purge unsupported RSA key sizes from VTS tests" into oc-dev
am:
bc970b089f
Change-Id: Id40754b5761b2acca8a487d33a4479c3d9fb0c33
TreeHugger Robot [Wed, 14 Jun 2017 02:22:13 +0000 (02:22 +0000)]
Merge "Purge unsupported RSA key sizes from VTS tests" into oc-dev
Michael Butler [Wed, 14 Jun 2017 01:38:11 +0000 (01:38 +0000)]
Merge "Fixed flaky RenderScript VTS Test" into oc-dev am:
d8e99f75cb
am:
4a680ee322
Change-Id: Ie3393a94c8f11702e228cef1c8df9cdc0084146c
Michael Butler [Wed, 14 Jun 2017 01:37:35 +0000 (01:37 +0000)]
Merge "Fixed flaky RenderScript VTS Test" into oc-dev am:
d8e99f75cb
am:
4294386d9b
Change-Id: I72ad3f83a5707670f9abd87596682d8972847fe5
Michael Butler [Wed, 14 Jun 2017 01:34:05 +0000 (01:34 +0000)]
Merge "Fixed flaky RenderScript VTS Test" into oc-dev
am:
d8e99f75cb
Change-Id: Ib8bc975063564100258bef9f805aff6e6832db56
Michael Butler [Wed, 14 Jun 2017 01:33:36 +0000 (01:33 +0000)]
Merge "Fixed flaky RenderScript VTS Test" into oc-dev
am:
d8e99f75cb
Change-Id: Iedc4ce15dcfec27da4e1b4df5057fd5ab3f8fcc2
TreeHugger Robot [Wed, 14 Jun 2017 01:26:29 +0000 (01:26 +0000)]
Merge "Fixed flaky RenderScript VTS Test" into oc-dev
pkanwar [Tue, 13 Jun 2017 20:50:25 +0000 (20:50 +0000)]
Radio Interface changes to allow the modem to query the framework for the key. am:
1076d5ba87 am:
fd603f9274
am:
465c960b85
Change-Id: Ia69c3018857b25425745e4e68e768eb29d7f727e
pkanwar [Tue, 13 Jun 2017 20:38:53 +0000 (20:38 +0000)]
Radio Interface changes to allow the modem to query the framework for the key. am:
1076d5ba87
am:
fd603f9274
Change-Id: Ib6bdb9102b9271329c29f6f5caf48a7d1a51b584
pkanwar [Tue, 13 Jun 2017 20:30:45 +0000 (20:30 +0000)]
Radio Interface changes to allow the modem to query the framework for the key.
am:
1076d5ba87
Change-Id: I7191109616d9fb51e2aac762f9685c91782f9f6b
Janis Danisevskis [Tue, 6 Jun 2017 17:11:07 +0000 (10:11 -0700)]
Purge unsupported RSA key sizes from VTS tests
Support for 256 bit RSA keys are not mandated by keymaster specs and
must not be used in the VTS tests.
Bug:
62581389
Change-Id: If315088db2752ac2efe31fdb95db7ca13c3ce225
Chia-I Wu [Tue, 13 Jun 2017 16:25:57 +0000 (16:25 +0000)]
Merge "graphics: fix gralloc1 usage flags in default impl" into oc-dr1-dev
am:
1029762eef
Change-Id: If3669c4c943ca43440abe7f30f07b4fb898601da
Chia-I Wu [Tue, 13 Jun 2017 16:21:10 +0000 (16:21 +0000)]
Merge "graphics: fix gralloc1 usage flags in default impl" into oc-dr1-dev
Michael Butler [Tue, 23 May 2017 00:01:24 +0000 (17:01 -0700)]
Fixed flaky RenderScript VTS Test
Added missing synchronization before context destroy
Bug:
62535730
Bug:
38385848
Test: make vts, does not fail with multiple tests
Change-Id: Ib0d038969e9a1d6f5ea555ccb60fed55b69e05dc
(cherry picked from commit
076f69aa2bc2301e3c93150503d469c02ed2458c)
Ruchi Kandoi [Thu, 8 Jun 2017 17:27:08 +0000 (10:27 -0700)]
Support NCI 2.0 for NFC VTS
Bug:
62322170
Test: Run vts test
Change-Id: I7ed331dac9d5918675c091620f099b6250e20700
(cherry picked from commit
ff8068d160b642c757f29ee56540dff0af468fe7)
Bailey Forrest [Mon, 12 Jun 2017 23:49:18 +0000 (16:49 -0700)]
Include missing headers
Bug: None
Test: Build
Change-Id: Id4967af4ab48ceda10c45edcb0bc4b856b991fd6
Ruchi Kandoi [Thu, 8 Jun 2017 17:27:08 +0000 (10:27 -0700)]
Support NCI 2.0 for NFC VTS
Bug:
62322170
Test: Run vts test
Change-Id: I7ed331dac9d5918675c091620f099b6250e20700
Myles Watson [Mon, 12 Jun 2017 23:03:57 +0000 (23:03 +0000)]
Merge "Bluetooth: Call vendor cleanup() in Close()" into oc-dev am:
32ee110269
am:
2d2138d344
Change-Id: If5dcfe8c815f34191b13c99811761ee58c6cdd98
Myles Watson [Mon, 12 Jun 2017 23:01:53 +0000 (23:01 +0000)]
Merge "Bluetooth: Call vendor cleanup() in Close()" into oc-dev am:
32ee110269
am:
76f5c505bf
Change-Id: I67c697c5eafc2bbbfea2a042e2bc8bc263ee8b4b
Myles Watson [Mon, 12 Jun 2017 22:59:29 +0000 (22:59 +0000)]
Merge "Bluetooth: Call vendor cleanup() in Close()" into oc-dev
am:
32ee110269
Change-Id: I6e361c5cb186730ff25ff17d0418c9f01b944359
Myles Watson [Mon, 12 Jun 2017 22:58:37 +0000 (22:58 +0000)]
Merge "Bluetooth: Call vendor cleanup() in Close()" into oc-dev
am:
32ee110269
Change-Id: Ife84ad26372c42607ba34170d3ebbc7acc79c648
TreeHugger Robot [Mon, 12 Jun 2017 22:50:33 +0000 (22:50 +0000)]
Merge "Bluetooth: Call vendor cleanup() in Close()" into oc-dev
Chia-I Wu [Mon, 12 Jun 2017 22:14:37 +0000 (15:14 -0700)]
graphics: fix gralloc1 usage flags in default impl
BufferUsage::SENSOR_DIRECT_DATA should be filtered out for consumer
usage. BufferUsage::GPU_DATA_BUFFER should be filtered out for
producer usage and be translated to
GRALLOC1_CONSUMER_USAGE_GPU_DATA_BUFFER for consumer usage.
Bug:
62491483
Test: boots
Change-Id: I171712adf45ae80dadeed7997fb9872ff176fa1a
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
Change-Id: Iae18382f1f244be6a756a47753f0345e1925ca4a
Chih-Hung Hsieh [Mon, 12 Jun 2017 19:18:07 +0000 (12:18 -0700)]
Add OWNERS in hardware/interfaces
* Owners are selected from top CL approvals or owners.
They will be suggested to review/approve future CLs.
* OWNERS files are recognized by the new find-owners plugin, see .md files in
https://gerrit.googlesource.com/plugins/find-owners/+/master/src/main/resources/Documentation/
Test: build/make/tools/checkowners.py -c -v OWNERS
Change-Id: I6df752a2c803d956ab9f21cfce3aa07713cd91a5
Android Build Merger (Role) [Mon, 12 Jun 2017 04:51:08 +0000 (04:51 +0000)]
Merge "Merge "Fix vts tests:" into oc-dev am:
14b34e19d6 am:
01cb1ff6d7 -s ours" into oc-dr1-dev-plus-aosp
Shuo Qian [Mon, 12 Jun 2017 04:50:56 +0000 (04:50 +0000)]
Merge "Fix vts tests:" into oc-dev am:
14b34e19d6 -s ours
am:
7a5dad06bf -s ours
Change-Id: If1acc3cef00cd887446d135a89510e241a616dca
Shuo Qian [Mon, 12 Jun 2017 04:50:56 +0000 (04:50 +0000)]
Merge "Fix vts tests:" into oc-dev am:
14b34e19d6
am:
01cb1ff6d7 -s ours
Change-Id: Ib321ca514a53d0c038affbd0ee5757eb5cee5dbb
Shuo Qian [Mon, 12 Jun 2017 04:48:29 +0000 (04:48 +0000)]
Merge "Fix vts tests:" into oc-dev
am:
14b34e19d6
Change-Id: Ib2f1a77ece04254a73cdd69c9a46206593c5d4a9
Shuo Qian [Mon, 12 Jun 2017 04:48:26 +0000 (04:48 +0000)]
Merge "Fix vts tests:" into oc-dev
am:
14b34e19d6 -s ours
Change-Id: I20b62dd5c93feb863ddfcb042aa55ff7020dccf0
Shuo Qian [Mon, 12 Jun 2017 04:44:15 +0000 (04:44 +0000)]
Merge "Fix vts tests:" into oc-dev
Shuo Qian [Mon, 12 Jun 2017 03:44:50 +0000 (03:44 +0000)]
Merge "Fix vts tests:" into oc-dr1-dev
am:
8ee9a9f01e
Change-Id: I580e6127c0c6ff3898f3d5a6390855404a8c14b3
Shuo Qian [Mon, 12 Jun 2017 03:41:00 +0000 (03:41 +0000)]
Merge "Fix vts tests:" into oc-dr1-dev
Android Build Merger (Role) [Sat, 10 Jun 2017 05:22:04 +0000 (05:22 +0000)]
Merge "Increase Timeout for dequeue message am:
4e39ff9235 am:
9fe2d4c99d" into oc-dr1-dev-plus-aosp
Ram Mohan M [Sat, 10 Jun 2017 05:21:54 +0000 (05:21 +0000)]
Increase Timeout for dequeue message am:
4e39ff9235
am:
c36d38fb55
Change-Id: I2b3aa382ca25d07ca8f3239d7f3c0cf03c7d2338
Ram Mohan M [Sat, 10 Jun 2017 05:21:54 +0000 (05:21 +0000)]
Increase Timeout for dequeue message am:
4e39ff9235
am:
9fe2d4c99d
Change-Id: I94660c6e47e5cf9e30d421fe287fba08d4897872
Ram Mohan M [Sat, 10 Jun 2017 05:19:54 +0000 (05:19 +0000)]
Increase Timeout for dequeue message
am:
4e39ff9235
Change-Id: If484fa82b3215380f17057e5cadbb6fb42685f81
Ram Mohan M [Sat, 10 Jun 2017 05:19:54 +0000 (05:19 +0000)]
Increase Timeout for dequeue message
am:
4e39ff9235
Change-Id: Ia6fc966e66668b944c4a484ea413f0bc0982082f
Ram Mohan M [Sat, 10 Jun 2017 02:55:39 +0000 (08:25 +0530)]
Increase Timeout for dequeue message
In vp9 encoder component, the callback responses are being recevied
after timeout. This is seen only in vp9. Even when no buffer processing
is done, Flush test, state transitions test fail due to slow responses.
This behavior is not seen in other components. This requires deeper
understanding of what is main culprit. But for now increase the timeout
Test: VtsHalMediaOmxV1_0Host
Bug:
37501531
Change-Id: I08abfefcf0cb38d312a4a2dc10908e24f88c54fd
Android Build Merger (Role) [Sat, 10 Jun 2017 01:33:30 +0000 (01:33 +0000)]
Merge changes from topic 'am-
4d21b9824d8247648c328224f533af1e' into oc-dr1-dev-plus-aosp
* changes:
Merge "bug fix: fix encoder input port configuration issues" into oc-dev am:
7d1592a732 am:
0eb102a18b
Merge "bug fix: configure input port format before setInputSurface" into oc-dev am:
bd5b6f8535 am:
4dc4fa7340
choose input color format between 420p, 420sp am:
1d273b3bcf am:
0113be3ac3
Ram Mohan M [Sat, 10 Jun 2017 01:32:45 +0000 (01:32 +0000)]
Merge "bug fix: fix encoder input port configuration issues" into oc-dev am:
7d1592a732
am:
0eb102a18b
Change-Id: I7205637574c06b010c23251fc271165d8e386a6a
Ram Mohan M [Sat, 10 Jun 2017 01:32:43 +0000 (01:32 +0000)]
Merge "bug fix: fix encoder input port configuration issues" into oc-dev am:
7d1592a732
am:
db3214fb49
Change-Id: I735d48815f9062064182ade2a69a70a02f98ef55
Ram Mohan M [Sat, 10 Jun 2017 01:32:42 +0000 (01:32 +0000)]
Merge "bug fix: configure input port format before setInputSurface" into oc-dev am:
bd5b6f8535
am:
4dc4fa7340
Change-Id: Iea639cf139db9263df8173a7ac54590081639ec2
Ram Mohan M [Sat, 10 Jun 2017 01:32:40 +0000 (01:32 +0000)]
Merge "bug fix: configure input port format before setInputSurface" into oc-dev am:
bd5b6f8535
am:
e808bef25e
Change-Id: I0952af17558a9b6f11581a0f98481ffd69750c2d
Ram Mohan M [Sat, 10 Jun 2017 01:32:38 +0000 (01:32 +0000)]
choose input color format between 420p, 420sp am:
1d273b3bcf
am:
0113be3ac3
Change-Id: I9bbc71344b750464518c3bddfabe4249773e1024
Ram Mohan M [Sat, 10 Jun 2017 01:32:37 +0000 (01:32 +0000)]
choose input color format between 420p, 420sp am:
1d273b3bcf
am:
3b79a2102f
Change-Id: I2a3ff69e719af9370ff8943522fc82ff4ed981ec