OSDN Git Service
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
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
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
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
Jeff Tinker [Wed, 18 Oct 2017 20:54:26 +0000 (20:54 +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
Change-Id: I3da01ec0b6a9272ae6b7310f4758e526e9af00d7
Wonsik Kim [Wed, 18 Oct 2017 20:52:57 +0000 (20:52 +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
Change-Id: Id8babd35cfba031171c9661c0270aee4bff6e15d
Marco Nelissen [Wed, 18 Oct 2017 20:51:55 +0000 (20:51 +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
Change-Id: I7e3c7cccf12aebd69e061604f605bda6d7364a9c
Andy Hung [Wed, 18 Oct 2017 20:50:34 +0000 (20:50 +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
Change-Id: Ibab97ff08663841d14d0fd1662a9a9c71d68a887
Dongwon Kang [Wed, 18 Oct 2017 20:49:26 +0000 (20:49 +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
Change-Id: Ied942a2d91a98280afba335586db5ee4e491e366
Andy Hung [Wed, 18 Oct 2017 20:48:22 +0000 (20:48 +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
Change-Id: I17145e786d277f176ed4d98fb1c389b5a39f3bd9
Dongwon Kang [Wed, 18 Oct 2017 20:47:02 +0000 (20:47 +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
Change-Id: I30091eb84946ca71574f153cc52d002f8d1039b6
Dongwon Kang [Wed, 18 Oct 2017 20:45:56 +0000 (20:45 +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
Change-Id: Ib91b8dfb4fc0b46a1213b99d292e4ae3b06344d2
Jeff Tinker [Wed, 18 Oct 2017 20:36:35 +0000 (20:36 +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
Change-Id: I1b7dfd7310baabb5d819ead53d4e7a0ce4218267
Wonsik Kim [Wed, 18 Oct 2017 20:35:31 +0000 (20:35 +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
Change-Id: I005ce0f429f867ef6fc1eef80d57b173f96ea7f5
Marco Nelissen [Wed, 18 Oct 2017 20:34:05 +0000 (20:34 +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
Change-Id: Ib945110140e94747c31d9763e61c30f259dd9d36
Andy Hung [Wed, 18 Oct 2017 20:32:43 +0000 (20:32 +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
Change-Id: I008f2b8129130240954d3138ee800cc4d87845ee
Dongwon Kang [Wed, 18 Oct 2017 20:31:45 +0000 (20:31 +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
Change-Id: Ib208be063bb7199be36e1f2cd727288a32009566
Andy Hung [Wed, 18 Oct 2017 20:30:29 +0000 (20:30 +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
Change-Id: Ic48a6909a11bb53136d081dd45cccd038abe9409
Dongwon Kang [Wed, 18 Oct 2017 20:29:29 +0000 (20:29 +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
Change-Id: If28f0be8aca93143a4cbc93db40f85a17741de04
Dongwon Kang [Wed, 18 Oct 2017 20:28:10 +0000 (20:28 +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
Change-Id: Ibc6ae64a7e0f6148020187ab508edb8c46952430
Jeff Tinker [Wed, 18 Oct 2017 20:23:55 +0000 (20:23 +0000)]
Fix information disclosure in mediadrmserver am:
b41a527176 am:
70dc77cc94 am:
e41b49b5ea am:
470e03a10b am:
d1e097f456 am:
32ae22ff0f am:
4e55c5aae0 am:
88e846c4e7
am:
acfb40f741
Change-Id: I324d61048d69474dd8cb3d2ee795e40d0c2fa341
Wonsik Kim [Wed, 18 Oct 2017 20:22:55 +0000 (20:22 +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
Change-Id: I0617809b7132ea73e1ca4664202c634a0f691529
Marco Nelissen [Wed, 18 Oct 2017 20:21:35 +0000 (20:21 +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
Change-Id: Ibed9f7d9b3bd6e74fa25a8702e5ba4488892cc5b
Andy Hung [Wed, 18 Oct 2017 20:20:41 +0000 (20:20 +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
Change-Id: If227979379e29e4b2fcda3f26b12ec29b8e8f4e3
Dongwon Kang [Wed, 18 Oct 2017 20:19:23 +0000 (20:19 +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
Change-Id: I4e8167a3519944063eb2c0d4ec3f3f68ecad849f
Andy Hung [Wed, 18 Oct 2017 20:18:28 +0000 (20:18 +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
Change-Id: Ieaa372778c41ff7f6e9e4406888a28342ad426c8
Dongwon Kang [Wed, 18 Oct 2017 20:17:18 +0000 (20:17 +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
Change-Id: I7d8b52f627f757a53b17071476504c19e4e744e3
Dongwon Kang [Wed, 18 Oct 2017 20:16:15 +0000 (20:16 +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
Change-Id: Ie7737220ddb894c068043fa48bd5e37e89bf0368
Jeff Tinker [Wed, 18 Oct 2017 20:03:50 +0000 (20:03 +0000)]
Fix information disclosure in mediadrmserver am:
b41a527176 am:
70dc77cc94 am:
e41b49b5ea am:
470e03a10b am:
d1e097f456 am:
32ae22ff0f am:
4e55c5aae0
am:
88e846c4e7
Change-Id: I1987c61f62fb57f452f533d4f674c1cff1f0cbf2
Wonsik Kim [Wed, 18 Oct 2017 20:02:31 +0000 (20:02 +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
Change-Id: I1173299ef3ac373e7abfdece7d8e392ae0ee526b
Marco Nelissen [Wed, 18 Oct 2017 20:01:21 +0000 (20:01 +0000)]
Merge "Fix memory leaks" into lmp-dev am:
3e913a793c am:
0ae16eb779 am:
cf520f4f9e am:
22b4aa34ea am:
a4856a624a am:
64fa39c01c am:
ffb8750131
am:
f2131eb33e
Change-Id: I485506bfa51288be02ff02d9c4f0a2e96a44e69d
Andy Hung [Wed, 18 Oct 2017 20:00:16 +0000 (20:00 +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
Change-Id: I057cb93b31b4fb98372898a18baa5e1431ee20d7
Dongwon Kang [Wed, 18 Oct 2017 19:58:04 +0000 (19:58 +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
Change-Id: I7484df4a223ff4f3fbcb8a7c0172873207076ef4
Andy Hung [Wed, 18 Oct 2017 19:56:54 +0000 (19:56 +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
Change-Id: I9683cb438916d2a6d87dfbc6c238e5e334c2c00e
Dongwon Kang [Wed, 18 Oct 2017 19:55:54 +0000 (19:55 +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
Change-Id: I7d9568debfbc8eabf7379ae6044c7437f7c2252d
Dongwon Kang [Wed, 18 Oct 2017 19:54:38 +0000 (19:54 +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
Change-Id: I8a7830f36370423c37aee4b325ea18d1c49471a2
Jeff Tinker [Wed, 18 Oct 2017 19:35:25 +0000 (19:35 +0000)]
Fix information disclosure in mediadrmserver am:
b41a527176 am:
70dc77cc94 am:
e41b49b5ea am:
470e03a10b am:
d1e097f456 am:
32ae22ff0f
am:
4e55c5aae0
Change-Id: Ifb5687563b3e0425111abdae95bc88ea94480878
Wonsik Kim [Wed, 18 Oct 2017 19:34:42 +0000 (19:34 +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
Change-Id: I43e41b4e23129b9db1748af8de00cbe2096d654c
Marco Nelissen [Wed, 18 Oct 2017 19:33:38 +0000 (19:33 +0000)]
Merge "Fix memory leaks" into lmp-dev am:
3e913a793c am:
0ae16eb779 am:
cf520f4f9e am:
22b4aa34ea am:
a4856a624a am:
64fa39c01c
am:
ffb8750131
Change-Id: I2539160ebbac1eb4bad3f54a76e58623711b3e9c
Andy Hung [Wed, 18 Oct 2017 19:32:40 +0000 (19:32 +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
Change-Id: Idb4443b3fa613f38e8f6987a4537c7b874cdb8b7
Dongwon Kang [Wed, 18 Oct 2017 19:31:30 +0000 (19:31 +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
Change-Id: I9c5b41e0607194674b24a0fcccc1b1c509d8229e
Andy Hung [Wed, 18 Oct 2017 19:30:37 +0000 (19:30 +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
Change-Id: I198c546497b3e571d3f21aacf4bd1b25bdbe7a06
Dongwon Kang [Wed, 18 Oct 2017 19:29:31 +0000 (19:29 +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
Change-Id: I02d6e6339ab477d752a5c38f40891f907fea6010
Dongwon Kang [Wed, 18 Oct 2017 19:28:40 +0000 (19:28 +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
Change-Id: I3ec108a50ed00f9d87e9ef67e08d6a02770d9f64