OSDN Git Service
Edwin Wong [Sat, 7 Oct 2017 01:21:06 +0000 (18:21 -0700)]
Validate decryption key length to decrypt function.
Cherry picked from http://go/ag/
3038278.
AesCtrDecryptor::decrypt() doesn't check whether the size of "key"
is equal to 16 bytes, which may lead to an OOB read problem in the
context of mediadrmserver.
Add DecryptsWithEmptyKey and DecryptsWithKeyTooLong unit tests.
Test: ClearKeyDrmUnitTest
adb shell LD_LIBRARY_PATH="/vendor/lib/mediadrm"
/data/nativetest/ClearKeyDrmUnitTest/ClearKeyDrmUnitTest
bug:
63982768
Change-Id: I1f22c9df2b051972b2c532608b7f203e3ce77926
(cherry picked from commit
379b672b189aa72ce0103b485019022f3e292c36)
Ray Essick [Thu, 12 Oct 2017 17:15:31 +0000 (10:15 -0700)]
avoid 32-bit integer overflow
change calculation to scale encoder delay and padding when sample rate
changes to use 64-bit math and avoid possible 32-bit overflow.
Bug:
67737022
Test: re-ran affected use case
Change-Id: I6e37341256f3f0e3274ffdd3bad284eaacac25ab
(cherry picked from commit
73e95a9bd43724058651cb11c58dbe3fae651d56)
(cherry picked from commit
e0d1b3816e73629029f552da5df31ef31bde2c19)
Mikhail Naganov [Tue, 24 Oct 2017 21:44:43 +0000 (14:44 -0700)]
Add EFFECT_CMD_SET_PARAM parameter checking to Preset Reverb
Bug:
67647856
Test: Added CTS tests
Change-Id: I027ce8f7a1cdb8406ca423aaae7c45b6b76617f0
(cherry picked from commit
ee804dfa15cc2d34e5d67a9b437cd023349d633b)
Pawin Vongmasa [Thu, 28 Sep 2017 12:31:11 +0000 (05:31 -0700)]
Protect against possible race conditions
Test: make cts -j123 && cts-tradefed run cts-dev -m \
CtsMediaTestCases --compatibility:module-arg \
CtsMediaTestCases:include-annotation:\
android.platform.test.annotations.RequiresDevice
Test: Run the poc in b/
38234812
Bug:
38234812
Change-Id: I28322e5a812c02c8e449ab8773715f60b9f5d976
(cherry picked from commit
f9c81464b9494082fa7cdff9f70c5402e8ac78c0)
Harish Mahendrakar [Thu, 5 Oct 2017 08:48:26 +0000 (14:18 +0530)]
SoftAVCDec: Handle zero length input without EOS
When a zero length input buffer is sent to SoftAVC decoder
without EOS set in nFlags, SoftAVC decoder plugin was
entering an infinite loop. Fixed it by returning from
onQueueFilled for such cases.
Bug:
66969349
Test: Tested using poc associated with the bug
Change-Id: I79cebc8f5b40c51256aba83a08deb547b220c4d7
(cherry picked from commit
21943c05f0ee2350647a6fa5ee17aa3c68859383)
Naveen Kumar P [Wed, 4 Oct 2017 04:25:14 +0000 (09:55 +0530)]
Access HEVC context after create fail check
Bug:
66969193
Change-Id: Icd1c8d78986e3795ba7f1c1d50ebeb90d77f6178
(cherry picked from commit
2bee8317ecfa5dca3c43d99db40491c4e28f832d)
Marco Nelissen [Mon, 9 Oct 2017 21:59:43 +0000 (14:59 -0700)]
Fix edge case when applying id3 unsynchronization
Bug:
63100526
Test: opened poc, other files
Change-Id: I0a51a2a11d0ea84ede0c075de650a7118f0e00c5
(cherry picked from commit
3e70296461c5f260988ab21854a6f43fdafea764)
android-build-team Robot [Thu, 9 Nov 2017 05:44:32 +0000 (05:44 +0000)]
Merge cherrypicks of [
3196053,
3195996,
3195997,
3195998,
3196073,
3196093,
3196113,
3195934,
3195999,
3196074,
3196133,
3196134,
3195914,
3195915,
3195916] into oc-mr1-release
Change-Id: I95acbaa82a1bc595d122bab54fb7a4e25e37d4ff
Yin-Chia Yeh [Tue, 7 Nov 2017 01:16:22 +0000 (17:16 -0800)]
Camera NDK: fix bug in lock order
AImage::close() can be called by AImageReader while holding
AImageReader::mLock.
Also fix ACaptureFailure double free issue.
Test: AR test app + CTS stress
Bug:
68885255
Change-Id: I17037e3e30e0f53b35ca538a3f321693c539cbdc
Merged-In: I17037e3e30e0f53b35ca538a3f321693c539cbdc
(cherry picked from commit
a10ab5bfd1ca27128fdbe43ce58a68e92b2896a1)
android-build-team Robot [Thu, 2 Nov 2017 04:50:45 +0000 (04:50 +0000)]
Merge cherrypicks of [
3156476,
3155698,
3156194,
3156639,
3156018,
3156477,
3156098,
3156099,
3156100,
3156101,
3156102,
3158393,
3155699,
3155700,
3156195,
3156196,
3156019,
3156020,
3158394] into oc-mr1-release
Change-Id: I107302823b3d3d6a219bdf2caa8909e185ae227a
Phil Burk [Thu, 26 Oct 2017 19:11:47 +0000 (12:11 -0700)]
aaudio: fix loss of sync with HW FIFO index
This fixes a problem with intermittent severe distortion
and variable latency after restarting a stream.
Bug:
68003241
Test: write_sine_callback -pl -m2 -n2 -s5 -c2 -l100
Merged-In: Id7418adb86f2869ac74936cfbd365815a0a0e923
Change-Id: Id7418adb86f2869ac74936cfbd365815a0a0e923
(cherry picked from commit
999e110dac3783df71e5606be1d86f1b122145c0)
android-build-team Robot [Mon, 23 Oct 2017 02:34:35 +0000 (02:34 +0000)]
Snap for
4411005 from
c347c2eaf87c640d664f623f90a3ec6383bfe4f7 to oc-mr1-release
Change-Id: I8dc053f7aa057562253b2d0879c23afef32fec36
Marco Nelissen [Fri, 20 Oct 2017 17:44:43 +0000 (17:44 +0000)]
Fix build am:
48caffe6fe am:
1da4542abd -s ours am:
ab486b087e am:
04b334a98d am:
f231e8b680 am:
31b9dbb43b am:
d799181f51 am:
7edb039dde am:
7cc9d6763e am:
5ff79c2a46 am:
6abd03fa5d am:
7947199a58
am:
490e643cc1
Change-Id: I7480b25c2dca3b4ea23d470927004a7735e99512
Lajos Molnar [Fri, 20 Oct 2017 17:43:06 +0000 (17:43 +0000)]
Merge "OMXNodeInstance: use a lock in freeNode" into lmp-dev am:
288566faba -s ours am:
2a5e425ab4 am:
96c2fafc29 am:
b9da9fc1aa am:
ee22f8a68e am:
efd26f8a61 am:
2d073bdd1e am:
f5eb536d90 am:
27bdac8e05 am:
fab889e9e6 am:
44a79a8db8 am:
bdbb380663
am:
102b970dfb
Change-Id: I39ac02c1bca2764988c92b13ec4f83cedd7b8fa7
Eric Laurent [Fri, 20 Oct 2017 17:41:18 +0000 (17:41 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-dev am:
1a721bb633 -s ours am:
5a1dae0cea -s ours am:
fa5253c8bc -s ours am:
021923a373 -s ours am:
c798254fba -s ours am:
37e801176e -s ours am:
63b868e27b -s ours am:
68d7af9137 -s ours am:
4efb8774ab -s ours am:
94a417ca10 -s ours am:
8fc33c4f75 -s ours am:
ec248b8ddd -s ours
am:
8334241619 -s ours
Change-Id: Ibbb5bbadc73c6977d3adc41ba009c597bb30bd48
Marco Nelissen [Fri, 20 Oct 2017 17:40:43 +0000 (17:40 +0000)]
Fix build am:
48caffe6fe am:
1da4542abd -s ours am:
ab486b087e am:
04b334a98d am:
f231e8b680 am:
31b9dbb43b am:
d799181f51 am:
7edb039dde am:
7cc9d6763e am:
5ff79c2a46 am:
6abd03fa5d
am:
7947199a58
Change-Id: Ib6d53bed55ea0dfdea977451fdaaffc5230068fa
Eric Laurent [Fri, 20 Oct 2017 17:39:00 +0000 (17:39 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-mr1-dev am:
b6b4443dbb am:
74684f638b am:
af5ce97781 am:
7190597c26 am:
5de64b02a3 -s ours am:
2ed01f0006 -s ours am:
1ade78dc5d -s ours am:
c75c947a42 -s ours am:
849a10fce0 -s ours am:
faee2cdf2d -s ours am:
836b713352 -s ours
am:
24e679966e -s ours
Change-Id: Icb2e6e40f83b2cb6b63f81c2ae43fe3d2fb58a36
Lajos Molnar [Fri, 20 Oct 2017 17:38:54 +0000 (17:38 +0000)]
Merge "OMXNodeInstance: use a lock in freeNode" into lmp-dev am:
288566faba -s ours am:
2a5e425ab4 am:
96c2fafc29 am:
b9da9fc1aa am:
ee22f8a68e am:
efd26f8a61 am:
2d073bdd1e am:
f5eb536d90 am:
27bdac8e05 am:
fab889e9e6 am:
44a79a8db8
am:
bdbb380663
Change-Id: Ic2b6af7ef99ef64ec5788e33da457ea06e26b1db
Lajos Molnar [Fri, 20 Oct 2017 17:36:48 +0000 (17:36 +0000)]
Merge "OMXNodeInstance: use a lock in freeNode" into lmp-mr1-dev am:
60719598d5 am:
cdf0a102d9 am:
57ac76182e am:
36950f753b am:
a4cc48a3ae am:
f3b4e5d222 am:
73a7e98790 am:
0b306b0517 am:
bef1ae9f4d am:
6c930ece3c -s ours am:
40f6d8a086
am:
29f32408c6
Change-Id: Ic3e2840753f5c07f951dd37ffe8c37cacd2b9851
Eric Laurent [Fri, 20 Oct 2017 17:36:44 +0000 (17:36 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-dev am:
1a721bb633 -s ours am:
5a1dae0cea -s ours am:
fa5253c8bc -s ours am:
021923a373 -s ours am:
c798254fba -s ours am:
37e801176e -s ours am:
63b868e27b -s ours am:
68d7af9137 -s ours am:
4efb8774ab -s ours am:
94a417ca10 -s ours am:
8fc33c4f75 -s ours
am:
ec248b8ddd -s ours
Change-Id: I254dc5daa9e38e99ce5ae687e2953a8db8f725cf
Marco Nelissen [Fri, 20 Oct 2017 17:33:31 +0000 (17:33 +0000)]
Fix build am:
48caffe6fe am:
1da4542abd -s ours am:
ab486b087e am:
04b334a98d am:
f231e8b680 am:
31b9dbb43b am:
d799181f51 am:
7edb039dde am:
7cc9d6763e am:
5ff79c2a46
am:
6abd03fa5d
Change-Id: Iec6b0ffc5c6d47b85e3d5c0838ed67811696ad37
Eric Laurent [Fri, 20 Oct 2017 17:33:17 +0000 (17:33 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-mr1-dev am:
b6b4443dbb am:
74684f638b am:
af5ce97781 am:
7190597c26 am:
5de64b02a3 -s ours am:
2ed01f0006 -s ours am:
1ade78dc5d -s ours am:
c75c947a42 -s ours am:
849a10fce0 -s ours am:
faee2cdf2d -s ours
am:
836b713352 -s ours
Change-Id: Ib504331838fb576686547c925c9266c729e47022
Lajos Molnar [Fri, 20 Oct 2017 17:32:21 +0000 (17:32 +0000)]
Merge "OMXNodeInstance: use a lock in freeNode" into lmp-dev am:
288566faba -s ours am:
2a5e425ab4 am:
96c2fafc29 am:
b9da9fc1aa am:
ee22f8a68e am:
efd26f8a61 am:
2d073bdd1e am:
f5eb536d90 am:
27bdac8e05 am:
fab889e9e6
am:
44a79a8db8
Change-Id: Ie99043ef52945872e51aecf603ee4a1e7100daed
Lajos Molnar [Fri, 20 Oct 2017 17:31:54 +0000 (17:31 +0000)]
Merge "OMXNodeInstance: use a lock in freeNode" into lmp-mr1-dev am:
60719598d5 am:
cdf0a102d9 am:
57ac76182e am:
36950f753b am:
a4cc48a3ae am:
f3b4e5d222 am:
73a7e98790 am:
0b306b0517 am:
bef1ae9f4d am:
6c930ece3c -s ours
am:
40f6d8a086
Change-Id: I95971b8e76a4b6941fcb892787c9990bcdb5256c
Eric Laurent [Fri, 20 Oct 2017 17:30:49 +0000 (17:30 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-dev am:
1a721bb633 -s ours am:
5a1dae0cea -s ours am:
fa5253c8bc -s ours am:
021923a373 -s ours am:
c798254fba -s ours am:
37e801176e -s ours am:
63b868e27b -s ours am:
68d7af9137 -s ours am:
4efb8774ab -s ours am:
94a417ca10 -s ours
am:
8fc33c4f75 -s ours
Change-Id: I8b37d6a44110f341cb2100764a6d36c3c1fdfa9d
Eric Laurent [Fri, 20 Oct 2017 17:29:07 +0000 (17:29 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-mr1-dev am:
b6b4443dbb am:
74684f638b am:
af5ce97781 am:
7190597c26 am:
5de64b02a3 -s ours am:
2ed01f0006 -s ours am:
1ade78dc5d -s ours am:
c75c947a42 -s ours am:
849a10fce0 -s ours
am:
faee2cdf2d -s ours
Change-Id: I44a1b689d2b395e477b5b9e145228e31ebf8b870
Lajos Molnar [Fri, 20 Oct 2017 17:27:38 +0000 (17:27 +0000)]
Merge "OMXNodeInstance: use a lock in freeNode" into lmp-mr1-dev am:
60719598d5 am:
cdf0a102d9 am:
57ac76182e am:
36950f753b am:
a4cc48a3ae am:
f3b4e5d222 am:
73a7e98790 am:
0b306b0517 am:
bef1ae9f4d
am:
6c930ece3c -s ours
Change-Id: I46be3e647e626302ed089aeb9867ef760bb40661
android-build-team Robot [Fri, 20 Oct 2017 07:12:05 +0000 (07:12 +0000)]
Snap for
4407597 from
a671979428d39d9ea780500aaf2142f0833c133f to oc-mr1-release
Change-Id: I4a54eec6f1e55e21a04f1229104a819ab90c7604
Wei Jia [Fri, 20 Oct 2017 01:02:45 +0000 (01:02 +0000)]
Merge changes from topic "
b23270724" into lmp-dev am:
5802bad0f4 am:
49acc79a1d -s ours am:
c4f7665a60 am:
34acd22bf1 am:
05832e9282 am:
10449d6e14 am:
36cd95e899 am:
0be98247a4 am:
c2776e757a am:
0e3e26382e am:
f70515771a am:
e257e82907
am:
8e5265577c
Change-Id: I11699ecf93c643b5670649123edb00cba08c1044
Wei Jia [Fri, 20 Oct 2017 00:41:16 +0000 (00:41 +0000)]
Merge changes from topic "
b23270724" into lmp-dev am:
5802bad0f4 am:
49acc79a1d -s ours am:
c4f7665a60 am:
34acd22bf1 am:
05832e9282 am:
10449d6e14 am:
36cd95e899 am:
0be98247a4 am:
c2776e757a am:
0e3e26382e am:
f70515771a
am:
e257e82907
Change-Id: I9e7dd457c4a13e61c564e6432cdf8a41bc04d1a5
Wei Jia [Fri, 20 Oct 2017 00:10:03 +0000 (00:10 +0000)]
Merge changes from topic "
b23270724" into lmp-dev am:
5802bad0f4 am:
49acc79a1d -s ours am:
c4f7665a60 am:
34acd22bf1 am:
05832e9282 am:
10449d6e14 am:
36cd95e899 am:
0be98247a4 am:
c2776e757a am:
0e3e26382e
am:
f70515771a
Change-Id: I2acf505ec1c207f6b596bf33aaf7cf509fd3504a
Marco Nelissen [Fri, 20 Oct 2017 00:04:39 +0000 (00:04 +0000)]
Fix build am:
48caffe6fe am:
1da4542abd -s ours am:
ab486b087e am:
04b334a98d am:
f231e8b680 am:
31b9dbb43b am:
d799181f51 am:
7edb039dde am:
7cc9d6763e
am:
5ff79c2a46
Change-Id: If3196859118493351493ead6775fe2fdc890df32
Lajos Molnar [Fri, 20 Oct 2017 00:03:10 +0000 (00:03 +0000)]
Merge "OMXNodeInstance: use a lock in freeNode" into lmp-dev am:
288566faba -s ours am:
2a5e425ab4 am:
96c2fafc29 am:
b9da9fc1aa am:
ee22f8a68e am:
efd26f8a61 am:
2d073bdd1e am:
f5eb536d90 am:
27bdac8e05
am:
fab889e9e6
Change-Id: Ic1759237ef98d43f8115afc36c46b94c953f8c7d
Eric Laurent [Fri, 20 Oct 2017 00:01:09 +0000 (00:01 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-dev am:
1a721bb633 -s ours am:
5a1dae0cea -s ours am:
fa5253c8bc -s ours am:
021923a373 -s ours am:
c798254fba -s ours am:
37e801176e -s ours am:
63b868e27b -s ours am:
68d7af9137 -s ours am:
4efb8774ab -s ours
am:
94a417ca10 -s ours
Change-Id: Ia6b21fbd6eee7ea29838dea3d5222b74c68b7521
Eric Laurent [Thu, 19 Oct 2017 23:59:56 +0000 (23:59 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-mr1-dev am:
b6b4443dbb am:
74684f638b am:
af5ce97781 am:
7190597c26 am:
5de64b02a3 -s ours am:
2ed01f0006 -s ours am:
1ade78dc5d -s ours am:
c75c947a42 -s ours
am:
849a10fce0 -s ours
Change-Id: Ic1dc85dd5a6c2b6cd3cb53cacc6371d2f43a171f
Lajos Molnar [Thu, 19 Oct 2017 23:58:25 +0000 (23:58 +0000)]
Merge "OMXNodeInstance: use a lock in freeNode" into lmp-mr1-dev am:
60719598d5 am:
cdf0a102d9 am:
57ac76182e am:
36950f753b am:
a4cc48a3ae am:
f3b4e5d222 am:
73a7e98790 am:
0b306b0517
am:
bef1ae9f4d
Change-Id: I03fc5c223063fe012aef36f50c98e7155291cb1c
Wei Jia [Thu, 19 Oct 2017 23:56:53 +0000 (23:56 +0000)]
Merge changes from topic "
b23270724" into lmp-dev am:
5802bad0f4 am:
49acc79a1d -s ours am:
c4f7665a60 am:
34acd22bf1 am:
05832e9282 am:
10449d6e14 am:
36cd95e899 am:
0be98247a4 am:
c2776e757a
am:
0e3e26382e
Change-Id: I492ba3ce792c8a5584e619bed01fc501a8cf2fc3
Marco Nelissen [Thu, 19 Oct 2017 23:38:48 +0000 (23:38 +0000)]
Fix build am:
48caffe6fe am:
1da4542abd -s ours am:
ab486b087e am:
04b334a98d am:
f231e8b680 am:
31b9dbb43b am:
d799181f51 am:
7edb039dde
am:
7cc9d6763e
Change-Id: I873bf2fb8de3bca60f601ff936ac3ec98faad55e
Marco Nelissen [Thu, 19 Oct 2017 23:36:23 +0000 (23:36 +0000)]
Fix build am:
48caffe6fe am:
1da4542abd -s ours am:
ab486b087e am:
04b334a98d am:
f231e8b680 am:
31b9dbb43b am:
d799181f51
am:
7edb039dde
Change-Id: I578cdc02c156b11c649a388606d8f37288d3aebc
Lajos Molnar [Thu, 19 Oct 2017 23:34:38 +0000 (23:34 +0000)]
Merge "OMXNodeInstance: use a lock in freeNode" into lmp-dev am:
288566faba -s ours am:
2a5e425ab4 am:
96c2fafc29 am:
b9da9fc1aa am:
ee22f8a68e am:
efd26f8a61 am:
2d073bdd1e am:
f5eb536d90
am:
27bdac8e05
Change-Id: I5bacdd7761682d68361193b997a7dc7846228008
Eric Laurent [Thu, 19 Oct 2017 23:33:21 +0000 (23:33 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-dev am:
1a721bb633 -s ours am:
5a1dae0cea -s ours am:
fa5253c8bc -s ours am:
021923a373 -s ours am:
c798254fba -s ours am:
37e801176e -s ours am:
63b868e27b -s ours am:
68d7af9137 -s ours
am:
4efb8774ab -s ours
Change-Id: Ib1315607c45fe70f95eb54af666db6a6114c9e99
Eric Laurent [Thu, 19 Oct 2017 23:31:50 +0000 (23:31 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-mr1-dev am:
b6b4443dbb am:
74684f638b am:
af5ce97781 am:
7190597c26 am:
5de64b02a3 -s ours am:
2ed01f0006 -s ours am:
1ade78dc5d -s ours
am:
c75c947a42 -s ours
Change-Id: Idb5cc2015cca47cad52cd93b472913d532bdf6ba
Lajos Molnar [Thu, 19 Oct 2017 23:30:48 +0000 (23:30 +0000)]
Merge "OMXNodeInstance: use a lock in freeNode" into lmp-mr1-dev am:
60719598d5 am:
cdf0a102d9 am:
57ac76182e am:
36950f753b am:
a4cc48a3ae am:
f3b4e5d222 am:
73a7e98790
am:
0b306b0517
Change-Id: I127201e0209dfa53bd78138fa84c5543f4677990
Wei Jia [Thu, 19 Oct 2017 23:27:30 +0000 (23:27 +0000)]
Merge changes from topic "
b23270724" into lmp-dev am:
5802bad0f4 am:
49acc79a1d -s ours am:
c4f7665a60 am:
34acd22bf1 am:
05832e9282 am:
10449d6e14 am:
36cd95e899 am:
0be98247a4
am:
c2776e757a
Change-Id: Ida5e52d730bccdd76be82d7c69392f5be865ce35
Marco Nelissen [Thu, 19 Oct 2017 23:23:14 +0000 (23:23 +0000)]
Fix build am:
48caffe6fe am:
1da4542abd -s ours am:
ab486b087e am:
04b334a98d am:
f231e8b680 am:
31b9dbb43b
am:
d799181f51
Change-Id: I09d876848d3487f67719ef14e558773d335feb05
Lajos Molnar [Thu, 19 Oct 2017 23:18:49 +0000 (23:18 +0000)]
Merge "OMXNodeInstance: use a lock in freeNode" into lmp-dev am:
288566faba -s ours am:
2a5e425ab4 am:
96c2fafc29 am:
b9da9fc1aa am:
ee22f8a68e am:
efd26f8a61 am:
2d073bdd1e
am:
f5eb536d90
Change-Id: Ifea26b1a0a59362d01c0f60c01478cb5428b1ab5
Eric Laurent [Thu, 19 Oct 2017 23:17:30 +0000 (23:17 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-dev am:
1a721bb633 -s ours am:
5a1dae0cea -s ours am:
fa5253c8bc -s ours am:
021923a373 -s ours am:
c798254fba -s ours am:
37e801176e -s ours am:
63b868e27b -s ours
am:
68d7af9137 -s ours
Change-Id: I383dd11b76524bb9e1c3bde8d27429a0ddff5cce
Eric Laurent [Thu, 19 Oct 2017 23:16:33 +0000 (23:16 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-mr1-dev am:
b6b4443dbb am:
74684f638b am:
af5ce97781 am:
7190597c26 am:
5de64b02a3 -s ours am:
2ed01f0006 -s ours
am:
1ade78dc5d -s ours
Change-Id: Iaee2ff65a346cc0f8aafc5c7bd07e6467fb791ed
Lajos Molnar [Thu, 19 Oct 2017 23:15:15 +0000 (23:15 +0000)]
Merge "OMXNodeInstance: use a lock in freeNode" into lmp-mr1-dev am:
60719598d5 am:
cdf0a102d9 am:
57ac76182e am:
36950f753b am:
a4cc48a3ae am:
f3b4e5d222
am:
73a7e98790
Change-Id: Iae94781121218aaa0d22666bb88e367ad188344e
Wei Jia [Thu, 19 Oct 2017 23:14:11 +0000 (23:14 +0000)]
Merge changes from topic "
b23270724" into lmp-dev am:
5802bad0f4 am:
49acc79a1d -s ours am:
c4f7665a60 am:
34acd22bf1 am:
05832e9282 am:
10449d6e14 am:
36cd95e899
am:
0be98247a4
Change-Id: I0d8747c1b2944f488a4a64d56a721004ab62e300
Marco Nelissen [Thu, 19 Oct 2017 23:12:33 +0000 (23:12 +0000)]
Fix build am:
48caffe6fe am:
1da4542abd -s ours am:
ab486b087e am:
04b334a98d am:
f231e8b680
am:
31b9dbb43b
Change-Id: Iccbcf5b6c1227530b1198a33df4bf5080a6496e4
Lajos Molnar [Thu, 19 Oct 2017 23:04:38 +0000 (23:04 +0000)]
Merge "OMXNodeInstance: use a lock in freeNode" into lmp-dev am:
288566faba -s ours am:
2a5e425ab4 am:
96c2fafc29 am:
b9da9fc1aa am:
ee22f8a68e am:
efd26f8a61
am:
2d073bdd1e
Change-Id: I6e1fc676ee614b13229f1846f601fe26eb69ff62
Eric Laurent [Thu, 19 Oct 2017 23:03:25 +0000 (23:03 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-dev am:
1a721bb633 -s ours am:
5a1dae0cea -s ours am:
fa5253c8bc -s ours am:
021923a373 -s ours am:
c798254fba -s ours am:
37e801176e -s ours
am:
63b868e27b -s ours
Change-Id: I796c545395083ee7a50b3bf2a61ca06b99cef996
Eric Laurent [Thu, 19 Oct 2017 23:02:27 +0000 (23:02 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-mr1-dev am:
b6b4443dbb am:
74684f638b am:
af5ce97781 am:
7190597c26 am:
5de64b02a3 -s ours
am:
2ed01f0006 -s ours
Change-Id: I6bc9312bbe0257341931eedff3eb8480ef690854
Lajos Molnar [Thu, 19 Oct 2017 23:01:11 +0000 (23:01 +0000)]
Merge "OMXNodeInstance: use a lock in freeNode" into lmp-mr1-dev am:
60719598d5 am:
cdf0a102d9 am:
57ac76182e am:
36950f753b am:
a4cc48a3ae
am:
f3b4e5d222
Change-Id: I1b49e5ab4ed73322d7bd6c8d43df1d0d6f43c4fa
Marco Nelissen [Thu, 19 Oct 2017 23:00:31 +0000 (23:00 +0000)]
Fix build am:
48caffe6fe am:
1da4542abd -s ours am:
ab486b087e am:
04b334a98d
am:
f231e8b680
Change-Id: Ibe86820231c7c86aec093282fb7944abaa03b32d
Wei Jia [Thu, 19 Oct 2017 23:00:14 +0000 (23:00 +0000)]
Merge changes from topic "
b23270724" into lmp-dev am:
5802bad0f4 am:
49acc79a1d -s ours am:
c4f7665a60 am:
34acd22bf1 am:
05832e9282 am:
10449d6e14
am:
36cd95e899
Change-Id: I56bd94f89743e0aee8089fdb19d999f0f94bb26b
Marco Nelissen [Thu, 19 Oct 2017 22:50:51 +0000 (22:50 +0000)]
Fix build am:
48caffe6fe am:
1da4542abd -s ours am:
ab486b087e
am:
04b334a98d
Change-Id: I29a12e5b361dd4f145daf2eef98bc59adb0f91b9
Lajos Molnar [Thu, 19 Oct 2017 22:47:11 +0000 (22:47 +0000)]
Merge "OMXNodeInstance: use a lock in freeNode" into lmp-dev am:
288566faba -s ours am:
2a5e425ab4 am:
96c2fafc29 am:
b9da9fc1aa am:
ee22f8a68e
am:
efd26f8a61
Change-Id: Ib21d56a7d64fbce2c5d2d55378b1eb7e5cb6f4c9
Eric Laurent [Thu, 19 Oct 2017 22:46:18 +0000 (22:46 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-dev am:
1a721bb633 -s ours am:
5a1dae0cea -s ours am:
fa5253c8bc -s ours am:
021923a373 -s ours am:
c798254fba -s ours
am:
37e801176e -s ours
Change-Id: Iba51d0f957ad1277547089df074b148056d91970
Eric Laurent [Thu, 19 Oct 2017 22:44:58 +0000 (22:44 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-mr1-dev am:
b6b4443dbb am:
74684f638b am:
af5ce97781 am:
7190597c26
am:
5de64b02a3 -s ours
Change-Id: Ic1e0b59044e2b56b051edf9987acb99357d4dab8
Marco Nelissen [Thu, 19 Oct 2017 22:42:53 +0000 (22:42 +0000)]
Fix build am:
48caffe6fe am:
1da4542abd -s ours
am:
ab486b087e
Change-Id: Ib644bc77055c492207ae0fb09c84122fea713719
Lajos Molnar [Thu, 19 Oct 2017 22:42:28 +0000 (22:42 +0000)]
Merge "OMXNodeInstance: use a lock in freeNode" into lmp-mr1-dev am:
60719598d5 am:
cdf0a102d9 am:
57ac76182e am:
36950f753b
am:
a4cc48a3ae
Change-Id: I0d3c62ca84d378acf64ffda1757ac7d2d8e1539c
Wei Jia [Thu, 19 Oct 2017 22:41:10 +0000 (22:41 +0000)]
Merge changes from topic "
b23270724" into lmp-dev am:
5802bad0f4 am:
49acc79a1d -s ours am:
c4f7665a60 am:
34acd22bf1 am:
05832e9282
am:
10449d6e14
Change-Id: I4191c7719ac0450a3efda91efdc2626c823fe59f
Lajos Molnar [Thu, 19 Oct 2017 22:29:50 +0000 (22:29 +0000)]
Merge "OMXNodeInstance: use a lock in freeNode" into lmp-dev am:
288566faba -s ours am:
2a5e425ab4 am:
96c2fafc29 am:
b9da9fc1aa
am:
ee22f8a68e
Change-Id: I6af2a53aeced262206eff94fc5b79039a5792362
Eric Laurent [Thu, 19 Oct 2017 22:23:44 +0000 (22:23 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-dev am:
1a721bb633 -s ours am:
5a1dae0cea -s ours am:
fa5253c8bc -s ours am:
021923a373 -s ours
am:
c798254fba -s ours
Change-Id: Id99a19dfb2f5d77f095225fbd9dcfcf0af675c4d
Lajos Molnar [Thu, 19 Oct 2017 22:23:16 +0000 (22:23 +0000)]
Merge "OMXNodeInstance: use a lock in freeNode" into lmp-dev am:
288566faba -s ours am:
2a5e425ab4 am:
96c2fafc29
am:
b9da9fc1aa
Change-Id: I4d3704cf947fed590b4fd324e1ba6d9cc08af2d5
Eric Laurent [Thu, 19 Oct 2017 22:21:13 +0000 (22:21 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-mr1-dev am:
b6b4443dbb am:
74684f638b am:
af5ce97781
am:
7190597c26
Change-Id: Idf697e91336a76a62e96a332976998a4a4f6d8e0
Marco Nelissen [Thu, 19 Oct 2017 22:20:50 +0000 (22:20 +0000)]
Fix build am:
48caffe6fe
am:
1da4542abd -s ours
Change-Id: I0cb8c6ea6b7580c34f858046f797282fcce15c1d
Lajos Molnar [Thu, 19 Oct 2017 22:19:55 +0000 (22:19 +0000)]
Merge "OMXNodeInstance: use a lock in freeNode" into lmp-mr1-dev am:
60719598d5 am:
cdf0a102d9 am:
57ac76182e
am:
36950f753b
Change-Id: Ia28bacb7f539a0cf15d1f2833f45a67c4234bd21
Wei Jia [Thu, 19 Oct 2017 22:18:36 +0000 (22:18 +0000)]
Merge changes from topic "
b23270724" into lmp-dev am:
5802bad0f4 am:
49acc79a1d -s ours am:
c4f7665a60 am:
34acd22bf1
am:
05832e9282
Change-Id: Ib25486f397851bcb6cd326bf3991fa85c24ae70d
Eric Laurent [Thu, 19 Oct 2017 22:12:07 +0000 (22:12 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-dev am:
1a721bb633 -s ours am:
5a1dae0cea -s ours am:
fa5253c8bc -s ours
am:
021923a373 -s ours
Change-Id: I5a09210ea4c9cc0a602dbcefecfa4b7b41dc9ea8
Eric Laurent [Thu, 19 Oct 2017 22:11:06 +0000 (22:11 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-mr1-dev am:
b6b4443dbb am:
74684f638b
am:
af5ce97781
Change-Id: Id35d069b64aaf629ac1e023e7f5f975f4b2a6fb6
Lajos Molnar [Thu, 19 Oct 2017 22:10:19 +0000 (22:10 +0000)]
Merge "OMXNodeInstance: use a lock in freeNode" into lmp-mr1-dev am:
60719598d5 am:
cdf0a102d9
am:
57ac76182e
Change-Id: I2d7f4d1e53b20695ddaaf95b452abbe19f253d88
Wei Jia [Thu, 19 Oct 2017 22:08:47 +0000 (22:08 +0000)]
Merge changes from topic "
b23270724" into lmp-dev am:
5802bad0f4 am:
49acc79a1d -s ours am:
c4f7665a60
am:
34acd22bf1
Change-Id: Icea965393ad64df892e36738baf734582075b160
Lajos Molnar [Thu, 19 Oct 2017 22:08:09 +0000 (22:08 +0000)]
Merge "OMXNodeInstance: use a lock in freeNode" into lmp-dev am:
288566faba -s ours am:
2a5e425ab4
am:
96c2fafc29
Change-Id: Id6894b1df46aa44a3fc872638b7460d31a7e5b58
Eric Laurent [Thu, 19 Oct 2017 22:07:17 +0000 (22:07 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-dev am:
1a721bb633 -s ours am:
5a1dae0cea -s ours
am:
fa5253c8bc -s ours
Change-Id: I81fd60488c379d4aed791d2a1c6f2f99c8f51585
Eric Laurent [Thu, 19 Oct 2017 22:06:38 +0000 (22:06 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-mr1-dev am:
b6b4443dbb
am:
74684f638b
Change-Id: I5c11295c9b097f8d359f221023e1bb1a03b7cb8f
Lajos Molnar [Thu, 19 Oct 2017 22:06:00 +0000 (22:06 +0000)]
Merge "OMXNodeInstance: use a lock in freeNode" into lmp-mr1-dev am:
60719598d5
am:
cdf0a102d9
Change-Id: I8ab45319aa9050f4fad1fadf3a67103528b944f8
Lajos Molnar [Thu, 19 Oct 2017 21:59:01 +0000 (21:59 +0000)]
Merge "OMXNodeInstance: use a lock in freeNode" into lmp-dev am:
288566faba -s ours
am:
2a5e425ab4
Change-Id: I06c3ccca7c10892564706666fd1e25a4d338edf7
Eric Laurent [Thu, 19 Oct 2017 21:57:40 +0000 (21:57 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-dev am:
1a721bb633 -s ours
am:
5a1dae0cea -s ours
Change-Id: If398ae680d0e7fd71a10894d3609fabdff700cc2
Eric Laurent [Thu, 19 Oct 2017 21:56:33 +0000 (21:56 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-mr1-dev
am:
b6b4443dbb
Change-Id: I1548fd726613cfc26f1e858b3190248cad00e5c8
Wei Jia [Thu, 19 Oct 2017 21:55:32 +0000 (21:55 +0000)]
Merge changes from topic "
b23270724" into lmp-dev am:
5802bad0f4 am:
49acc79a1d -s ours
am:
c4f7665a60
Change-Id: I1d5441f4aa0127c83c4e01ccf9bbfcfee82ee340
Lajos Molnar [Thu, 19 Oct 2017 21:55:25 +0000 (21:55 +0000)]
Merge "OMXNodeInstance: use a lock in freeNode" into lmp-mr1-dev
am:
60719598d5
Change-Id: Id2f4ed8f71a002794396dc11a77a0a42f55a44e6
Wei Jia [Thu, 19 Oct 2017 21:44:46 +0000 (21:44 +0000)]
Merge changes from topic "
b23270724" into lmp-dev am:
5802bad0f4
am:
49acc79a1d -s ours
Change-Id: I5546162289546690501066c8e5dfd1d7c6e5ea65
android-build-team Robot [Thu, 19 Oct 2017 06:16:38 +0000 (06:16 +0000)]
Snap for
4404534 from
2921de78e6a7df365ed806cf4b98193862a97807 to oc-mr1-release
Change-Id: I0b8d5b04b7c42f3b46b1a036d95cc1cc352ec431
Jeff Tinker [Wed, 18 Oct 2017 21:47:38 +0000 (21:47 +0000)]
Fix information disclosure in mediadrmserver am:
b41a527176 am:
70dc77cc94 am:
e41b49b5ea am:
470e03a10b am:
d1e097f456 am:
32ae22ff0f am:
4e55c5aae0 am:
88e846c4e7 am:
acfb40f741 am:
e2f8930c39 am:
b3a0e4680b am:
3cf728e758
am:
650e3e6325
Change-Id: I9109b02acf15f7498523569e432141da23edd6c6
Wonsik Kim [Wed, 18 Oct 2017 21:45:44 +0000 (21:45 +0000)]
Merge "m4v_h263: fix global buffer overflow" into lmp-dev am:
c41471f6df am:
643dd1d8d4 am:
7648415fc8 am:
c52190750e am:
fa75c18493 am:
b722ff0037 am:
5a5be67306 am:
19594343c6 am:
1c2ff96c7d am:
580f133541 am:
b18c345695 am:
ca8d765f12
am:
d85a5aff43
Change-Id: Ib3ad13f8f774957551ceaf97e672145cf02b34dd
Marco Nelissen [Wed, 18 Oct 2017 21:44:10 +0000 (21:44 +0000)]
Merge "Fix memory leaks" into lmp-dev am:
3e913a793c am:
0ae16eb779 am:
cf520f4f9e am:
22b4aa34ea am:
a4856a624a am:
64fa39c01c am:
ffb8750131 am:
f2131eb33e am:
da750ecced am:
2e88fb1b72 am:
546cc40a5a am:
f777cb29a7
am:
5a6520b002
Change-Id: Ie555fb55d538be5caea4db36de0957fb333e82d4
Andy Hung [Wed, 18 Oct 2017 21:42:53 +0000 (21:42 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into lmp-dev am:
35a587cdc5 am:
27c4e661d4 -s ours am:
ac43fbe5a6 -s ours am:
f513923b38 -s ours am:
a421c87781 -s ours am:
310807ff52 -s ours am:
25c38b2f40 -s ours am:
550c14e0a4 -s ours am:
99555160ee -s ours am:
a0fd1b9e00 -s ours am:
d206dd91b0 -s ours am:
b040d5f2e3 -s ours
am:
4c1c9c8f5d -s ours
Change-Id: Idc31a3b59814b086ac6df3d3611620d4d65a3808
Dongwon Kang [Wed, 18 Oct 2017 21:41:11 +0000 (21:41 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into lmp-mr1-dev am:
94c1663ec9 -s ours am:
5bc8146ac4 -s ours am:
e3c114277f -s ours am:
dce95dc139 -s ours am:
2388b54423 -s ours am:
9f03c8306c -s ours am:
916f4ec913 -s ours am:
6c84ce30a5 -s ours am:
088e5bc9ff -s ours am:
8f0760e2a2 -s ours am:
6b106b0bf8 -s ours
am:
aa9c912440 -s ours
Change-Id: I8ec0a765a9e031f9e05f6af92a22210f19be3609
Andy Hung [Wed, 18 Oct 2017 21:39:30 +0000 (21:39 +0000)]
Merge "EffectBundle: Check parameter and value size" into lmp-dev am:
57ad9301e7 am:
d566fb1cbf am:
7c5acccded am:
25bd563ea6 am:
652b0f30d7 am:
4adc519e51 am:
2ef36a4500 am:
13252cc9a1 am:
fb683ef073 am:
54fb12c17f am:
863257bd64 -s ours am:
8ddcc1e85a -s ours
am:
1c01cadb83 -s ours
Change-Id: I0c9aa437ec0bdcb80464e82f0fcc3b3ff710de4c
Dongwon Kang [Wed, 18 Oct 2017 21:38:10 +0000 (21:38 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into lmp-dev am:
7b27979c5e -s ours am:
5095462e64 -s ours am:
12e787d348 -s ours am:
33d5c3961e -s ours am:
d4ebb1c11e -s ours am:
1e4f17cc7f -s ours am:
f683584e29 -s ours am:
4a969bc360 -s ours am:
52c241ed72 -s ours am:
c9cdb1e9a6 -s ours am:
72892c2b11 -s ours am:
4e1e297cd9 -s ours
am:
07e905cd72 -s ours
Change-Id: Ibf5e25c627d356a919c2d8bbdb4c9c159c62d7a7
Dongwon Kang [Wed, 18 Oct 2017 21:36:37 +0000 (21:36 +0000)]
Block allocateBackup if the node is not secure node. am:
996be3eef1 am:
2bebd9c7f5 am:
395ec8c4af am:
238f43188a am:
0a78e48503 am:
ff286981c5 -s ours am:
d7d971edb4 -s ours am:
6f8cfdcb21 -s ours am:
5511f6b6af -s ours am:
ff21c08650 -s ours am:
81baac0cb5 -s ours am:
420edf7c3b -s ours
am:
ca915d072e -s ours
Change-Id: If9adbf3040746bdd97868e124ae9e0fd398207dd
Jeff Tinker [Wed, 18 Oct 2017 21:30:07 +0000 (21:30 +0000)]
Fix information disclosure in mediadrmserver am:
b41a527176 am:
70dc77cc94 am:
e41b49b5ea am:
470e03a10b am:
d1e097f456 am:
32ae22ff0f am:
4e55c5aae0 am:
88e846c4e7 am:
acfb40f741 am:
e2f8930c39 am:
b3a0e4680b
am:
3cf728e758
Change-Id: I53e89f1f051e679cd7c6a5aa7cac2271231e435f
Wonsik Kim [Wed, 18 Oct 2017 21:28:41 +0000 (21:28 +0000)]
Merge "m4v_h263: fix global buffer overflow" into lmp-dev am:
c41471f6df am:
643dd1d8d4 am:
7648415fc8 am:
c52190750e am:
fa75c18493 am:
b722ff0037 am:
5a5be67306 am:
19594343c6 am:
1c2ff96c7d am:
580f133541 am:
b18c345695
am:
ca8d765f12
Change-Id: I6f8995534740d6a76a031bdbc940d01fd3ffbc54
Marco Nelissen [Wed, 18 Oct 2017 21:27:13 +0000 (21:27 +0000)]
Merge "Fix memory leaks" into lmp-dev am:
3e913a793c am:
0ae16eb779 am:
cf520f4f9e am:
22b4aa34ea am:
a4856a624a am:
64fa39c01c am:
ffb8750131 am:
f2131eb33e am:
da750ecced am:
2e88fb1b72 am:
546cc40a5a
am:
f777cb29a7
Change-Id: I7e600d301a194038596a5e08081b02dbed05db8d
Andy Hung [Wed, 18 Oct 2017 21:25:57 +0000 (21:25 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into lmp-dev am:
35a587cdc5 am:
27c4e661d4 -s ours am:
ac43fbe5a6 -s ours am:
f513923b38 -s ours am:
a421c87781 -s ours am:
310807ff52 -s ours am:
25c38b2f40 -s ours am:
550c14e0a4 -s ours am:
99555160ee -s ours am:
a0fd1b9e00 -s ours am:
d206dd91b0 -s ours
am:
b040d5f2e3 -s ours
Change-Id: I64519a1369358836584a94fdae46f6cf6fa36385
Dongwon Kang [Wed, 18 Oct 2017 21:22:48 +0000 (21:22 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into lmp-mr1-dev am:
94c1663ec9 -s ours am:
5bc8146ac4 -s ours am:
e3c114277f -s ours am:
dce95dc139 -s ours am:
2388b54423 -s ours am:
9f03c8306c -s ours am:
916f4ec913 -s ours am:
6c84ce30a5 -s ours am:
088e5bc9ff -s ours am:
8f0760e2a2 -s ours
am:
6b106b0bf8 -s ours
Change-Id: Ie76a285c6392f9945399e9be88b663bb803b0f2c
Andy Hung [Wed, 18 Oct 2017 21:21:38 +0000 (21:21 +0000)]
Merge "EffectBundle: Check parameter and value size" into lmp-dev am:
57ad9301e7 am:
d566fb1cbf am:
7c5acccded am:
25bd563ea6 am:
652b0f30d7 am:
4adc519e51 am:
2ef36a4500 am:
13252cc9a1 am:
fb683ef073 am:
54fb12c17f am:
863257bd64 -s ours
am:
8ddcc1e85a -s ours
Change-Id: I1518eaa091b016c94c467426f664b67102cb51d4