OSDN Git Service
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
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
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 19:24:17 +0000 (19:24 +0000)]
Fix information disclosure in mediadrmserver am:
b41a527176 am:
70dc77cc94 am:
e41b49b5ea am:
470e03a10b am:
d1e097f456
am:
32ae22ff0f
Change-Id: Ifc48f7176ab62b35f016cef26fd35e5e273d5364
Wonsik Kim [Wed, 18 Oct 2017 19:23:11 +0000 (19:23 +0000)]
Merge "m4v_h263: fix global buffer overflow" into lmp-dev am:
c41471f6df am:
643dd1d8d4 am:
7648415fc8 am:
c52190750e am:
fa75c18493
am:
b722ff0037
Change-Id: Ie12d90e4849bfb57ae3589b82c4aa4eddaba6e4f
Marco Nelissen [Wed, 18 Oct 2017 19:21:23 +0000 (19:21 +0000)]
Merge "Fix memory leaks" into lmp-dev am:
3e913a793c am:
0ae16eb779 am:
cf520f4f9e am:
22b4aa34ea am:
a4856a624a
am:
64fa39c01c
Change-Id: Iae1a0ed14dd7d2b6e37fff0992e7e9e4ed91dce6
Jeff Tinker [Wed, 18 Oct 2017 19:18:02 +0000 (19:18 +0000)]
Fix information disclosure in mediadrmserver am:
b41a527176 am:
70dc77cc94 am:
e41b49b5ea am:
470e03a10b
am:
d1e097f456
Change-Id: I64308b97797ffa04e78eea0f608d14e33bd575de
Andy Hung [Wed, 18 Oct 2017 19:17:58 +0000 (19:17 +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
Change-Id: I4ccdd7901825f76976b5a2ba32926452c7d045d2
Dongwon Kang [Wed, 18 Oct 2017 19:16:39 +0000 (19:16 +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
Change-Id: I1a8647c09e683c7dd079d3fb3ade517338017e69
Andy Hung [Wed, 18 Oct 2017 19:15:40 +0000 (19:15 +0000)]
Merge "EffectBundle: Check parameter and value size" into lmp-dev am:
57ad9301e7 am:
d566fb1cbf am:
7c5acccded am:
25bd563ea6 am:
652b0f30d7
am:
4adc519e51
Change-Id: Ib14971bc13f26578e257c068838b95eb58db1f32
Wonsik Kim [Wed, 18 Oct 2017 19:14:41 +0000 (19:14 +0000)]
Merge "m4v_h263: fix global buffer overflow" into lmp-dev am:
c41471f6df am:
643dd1d8d4 am:
7648415fc8 am:
c52190750e
am:
fa75c18493
Change-Id: Ie09d9920dc3109ea07832784fc009b5f3931851e
Dongwon Kang [Wed, 18 Oct 2017 19:14:28 +0000 (19:14 +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
Change-Id: I04b37697e1e4fc99db496e90638a270e1d2827e5
Marco Nelissen [Wed, 18 Oct 2017 19:14:01 +0000 (19:14 +0000)]
Merge "Fix memory leaks" into lmp-dev am:
3e913a793c am:
0ae16eb779 am:
cf520f4f9e am:
22b4aa34ea
am:
a4856a624a
Change-Id: Ic6b1f0966f4ac3ed9c9d1a1836683b066b3e819d
Dongwon Kang [Wed, 18 Oct 2017 19:13:28 +0000 (19:13 +0000)]
Block allocateBackup if the node is not secure node. am:
996be3eef1 am:
2bebd9c7f5 am:
395ec8c4af am:
238f43188a am:
0a78e48503
am:
ff286981c5 -s ours
Change-Id: I6e0e50caf54dff752c31c86fa99d1ff5f30359c1
Andy Hung [Wed, 18 Oct 2017 19:08:11 +0000 (19:08 +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
Change-Id: I2b7a23bfad407e2123721d3276d3bfa6b9f0ee1f
Dongwon Kang [Wed, 18 Oct 2017 19:07:16 +0000 (19:07 +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
Change-Id: I25cbcfb675a2d7f45e7002c81fb53de0cbfad94b
Andy Hung [Wed, 18 Oct 2017 19:06:14 +0000 (19:06 +0000)]
Merge "EffectBundle: Check parameter and value size" into lmp-dev am:
57ad9301e7 am:
d566fb1cbf am:
7c5acccded am:
25bd563ea6
am:
652b0f30d7
Change-Id: I89a806810ccf83879cb9f1c1c3c6010915ae5535
Dongwon Kang [Wed, 18 Oct 2017 19:05:21 +0000 (19:05 +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
Change-Id: I7699dcd9415aa3940015d47e3f380c44b8c0367c
Dongwon Kang [Wed, 18 Oct 2017 19:03:27 +0000 (19:03 +0000)]
Block allocateBackup if the node is not secure node. am:
996be3eef1 am:
2bebd9c7f5 am:
395ec8c4af am:
238f43188a
am:
0a78e48503
Change-Id: I75bd01c40825a2f52a3c03d6b3b07c35bb5609e4
Jeff Tinker [Wed, 18 Oct 2017 18:56:10 +0000 (18:56 +0000)]
Fix information disclosure in mediadrmserver am:
b41a527176 am:
70dc77cc94 am:
e41b49b5ea
am:
470e03a10b
Change-Id: I515c8e9f0d580f3598253dd0e0f66e29465eba13
Wonsik Kim [Wed, 18 Oct 2017 18:53:34 +0000 (18:53 +0000)]
Merge "m4v_h263: fix global buffer overflow" into lmp-dev am:
c41471f6df am:
643dd1d8d4 am:
7648415fc8
am:
c52190750e
Change-Id: I1f5707d50bf6739cf2c279ffeaec1becb39c7a5f
Marco Nelissen [Wed, 18 Oct 2017 18:52:54 +0000 (18:52 +0000)]
Merge "Fix memory leaks" into lmp-dev am:
3e913a793c am:
0ae16eb779 am:
cf520f4f9e
am:
22b4aa34ea
Change-Id: I87bddf540b3e47903b5709b81e3f6f2925727995
Andy Hung [Wed, 18 Oct 2017 18:52:07 +0000 (18:52 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into lmp-dev am:
35a587cdc5 am:
27c4e661d4 -s ours am:
ac43fbe5a6 -s ours
am:
f513923b38 -s ours
Change-Id: I281533c1337341e069c6215649d140b38c7a2029
Dongwon Kang [Wed, 18 Oct 2017 18:48:36 +0000 (18:48 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into lmp-mr1-dev am:
94c1663ec9 -s ours am:
5bc8146ac4 -s ours
am:
e3c114277f -s ours
Change-Id: I1e01e4135e81f9c3c03596aaae5f4611056c23dd
Andy Hung [Wed, 18 Oct 2017 18:47:48 +0000 (18:47 +0000)]
Merge "EffectBundle: Check parameter and value size" into lmp-dev am:
57ad9301e7 am:
d566fb1cbf am:
7c5acccded
am:
25bd563ea6
Change-Id: Ia8a8cc2fba258473f62bcecfd1b415de58b6ed00
Dongwon Kang [Wed, 18 Oct 2017 18:46:24 +0000 (18:46 +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
Change-Id: I9bd93131f8da871a8184d47dae0645c48efce017
Dongwon Kang [Wed, 18 Oct 2017 18:45:22 +0000 (18:45 +0000)]
Block allocateBackup if the node is not secure node. am:
996be3eef1 am:
2bebd9c7f5 am:
395ec8c4af
am:
238f43188a
Change-Id: Ica1d840bbd7bcaa08c86f9d748f09acb0f40d2c5
Jeff Tinker [Wed, 18 Oct 2017 18:37:37 +0000 (18:37 +0000)]
Fix information disclosure in mediadrmserver am:
b41a527176 am:
70dc77cc94
am:
e41b49b5ea
Change-Id: I535fa9de1021f3bb3042905275984d7fdc73baee
Wonsik Kim [Wed, 18 Oct 2017 18:36:54 +0000 (18:36 +0000)]
Merge "m4v_h263: fix global buffer overflow" into lmp-dev am:
c41471f6df am:
643dd1d8d4
am:
7648415fc8
Change-Id: I708e6e58eb349bee856edeb934a6d268f4b67a89
Marco Nelissen [Wed, 18 Oct 2017 18:36:07 +0000 (18:36 +0000)]
Merge "Fix memory leaks" into lmp-dev am:
3e913a793c am:
0ae16eb779
am:
cf520f4f9e
Change-Id: I8dfeeaec257188d81a83122aeb7893321eee7677
Andy Hung [Wed, 18 Oct 2017 18:35:17 +0000 (18:35 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into lmp-dev am:
35a587cdc5 am:
27c4e661d4 -s ours
am:
ac43fbe5a6 -s ours
Change-Id: I152ad67ad96a5c094af84514e24cc4fadb785cdc
Dongwon Kang [Wed, 18 Oct 2017 18:34:34 +0000 (18:34 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into lmp-mr1-dev am:
94c1663ec9 -s ours
am:
5bc8146ac4 -s ours
Change-Id: I4919d6fc77956c06372b7b892b70901a9ae98ce6
Andy Hung [Wed, 18 Oct 2017 18:33:19 +0000 (18:33 +0000)]
Merge "EffectBundle: Check parameter and value size" into lmp-dev am:
57ad9301e7 am:
d566fb1cbf
am:
7c5acccded
Change-Id: Ic08b036eadb5d1c10bed355c98f63b8d94771287
Dongwon Kang [Wed, 18 Oct 2017 18:32:30 +0000 (18:32 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into lmp-dev am:
7b27979c5e -s ours am:
5095462e64 -s ours
am:
12e787d348 -s ours
Change-Id: Id74cae01703bb13af49f11bc05b017316dc4597f
Dongwon Kang [Wed, 18 Oct 2017 18:31:27 +0000 (18:31 +0000)]
Block allocateBackup if the node is not secure node. am:
996be3eef1 am:
2bebd9c7f5
am:
395ec8c4af
Change-Id: Ie9b80adf4b9e628d2b02c539ea93724b19e7e9c3
Jeff Tinker [Wed, 18 Oct 2017 18:23:23 +0000 (18:23 +0000)]
Fix information disclosure in mediadrmserver am:
b41a527176
am:
70dc77cc94
Change-Id: I1f9148571954ffc8e3727e90f6d84f039a8ddd5c
Wonsik Kim [Wed, 18 Oct 2017 18:22:45 +0000 (18:22 +0000)]
Merge "m4v_h263: fix global buffer overflow" into lmp-dev am:
c41471f6df
am:
643dd1d8d4
Change-Id: I4550a8fa2b3d7f65f0a5e3af96b5251c7566422c
Marco Nelissen [Wed, 18 Oct 2017 18:21:32 +0000 (18:21 +0000)]
Merge "Fix memory leaks" into lmp-dev am:
3e913a793c
am:
0ae16eb779
Change-Id: Ic94053bb496fe89612acb3d45eb60641b6dce0ab
Andy Hung [Wed, 18 Oct 2017 18:20:41 +0000 (18:20 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into lmp-dev am:
35a587cdc5
am:
27c4e661d4 -s ours
Change-Id: Ieeabc519b9d49792374fad19eacb7b3d7d33d506
Dongwon Kang [Wed, 18 Oct 2017 18:19:46 +0000 (18:19 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into lmp-mr1-dev
am:
94c1663ec9 -s ours
Change-Id: I371842b7ade30644d6d1d2beddf07208999bedb3
Andy Hung [Wed, 18 Oct 2017 18:18:33 +0000 (18:18 +0000)]
Merge "EffectBundle: Check parameter and value size" into lmp-dev am:
57ad9301e7
am:
d566fb1cbf
Change-Id: I9e6c1bce51509a9bac5f4337670ccd28940b2902
Dongwon Kang [Wed, 18 Oct 2017 18:16:19 +0000 (18:16 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into lmp-dev am:
7b27979c5e -s ours
am:
5095462e64 -s ours
Change-Id: I844a85ba7abc7590e0225a8b3bb8a93b08d14210
Dongwon Kang [Wed, 18 Oct 2017 18:14:09 +0000 (18:14 +0000)]
Block allocateBackup if the node is not secure node. am:
996be3eef1
am:
2bebd9c7f5
Change-Id: I39938bca7730ae2ade30a8154a2e16d94072d503
Marco Nelissen [Wed, 11 Oct 2017 17:51:27 +0000 (17:51 +0000)]
Fix build
am:
48caffe6fe
Change-Id: Ib1aa7ab1b874bbf44a90f8a1d8d36bbd8d242a88
Marco Nelissen [Wed, 11 Oct 2017 16:49:03 +0000 (09:49 -0700)]
Fix build
Bug:
37777357
Change-Id: Iaefab924ae0b4c8213e46679ffe9cfff2c68ab4f
Lajos Molnar [Wed, 11 Oct 2017 16:40:23 +0000 (16:40 +0000)]
Merge "OMXNodeInstance: use a lock in freeNode" into lmp-dev
am:
288566faba -s ours
Change-Id: Ia3e1ed7e8c123ee8c6e93a015fb3dad14a9c7d3b
Wei Jia [Tue, 10 Oct 2017 22:22:16 +0000 (22:22 +0000)]
MediaExtractor: ensure users to check returned value by getTrack. am:
46e359cbc0 am:
1fad937a9c am:
7b66ddb747
am:
6c15ae2aa9 -s ours
Change-Id: I100024372f76521ea697a7742dba8ac064e972cc
Marco Nelissen [Tue, 10 Oct 2017 22:21:58 +0000 (22:21 +0000)]
Don't CHECK if the source can't be started am:
711f83fa6c am:
c3f16a62a2 am:
0ada8e950b
am:
efcbb62657 -s ours
Change-Id: I418cd498a25c0a1670ab1ba52c5e85ced779c3e0
Lajos Molnar [Tue, 10 Oct 2017 22:11:06 +0000 (22:11 +0000)]
Merge "OMXNodeInstance: use a lock in freeNode" into lmp-dev
Eric Laurent [Tue, 10 Oct 2017 22:08:23 +0000 (22:08 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-dev
am:
1a721bb633 -s ours
Change-Id: I1cb6bfc9221a5e095b4aa9db8745fdf183a8ddbf
TreeHugger Robot [Tue, 10 Oct 2017 22:01:19 +0000 (22:01 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-dev
Eric Laurent [Tue, 10 Oct 2017 21:24:30 +0000 (21:24 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into lmp-mr1-dev
Eric Laurent [Tue, 10 Oct 2017 21:21:31 +0000 (21:21 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into nyc-dev
Wei Jia [Tue, 10 Oct 2017 21:15:33 +0000 (21:15 +0000)]
MediaExtractor: ensure users to check returned value by getTrack. am:
46e359cbc0 am:
1fad937a9c
am:
7b66ddb747
Change-Id: I70c6a85ff698c487031aed697a880ab0c5e62769
Marco Nelissen [Tue, 10 Oct 2017 21:14:35 +0000 (21:14 +0000)]
Don't CHECK if the source can't be started am:
711f83fa6c am:
c3f16a62a2
am:
0ada8e950b
Change-Id: I0a88ce1fa0a73966d2c1a61e1ff70d0f30d711ae
Wei Jia [Tue, 10 Oct 2017 21:10:51 +0000 (21:10 +0000)]
MediaExtractor: ensure users to check returned value by getTrack. am:
46e359cbc0
am:
1fad937a9c
Change-Id: If2da3bc028a3dd7bcbbb96ac1abe567e2ba71f86
Marco Nelissen [Tue, 10 Oct 2017 21:09:54 +0000 (21:09 +0000)]
Don't CHECK if the source can't be started am:
711f83fa6c
am:
c3f16a62a2
Change-Id: Ie546935111a19ca0ff157e8bffb95dffd7ed8a46
Lajos Molnar [Tue, 10 Oct 2017 21:09:20 +0000 (21:09 +0000)]
Merge "OMXNodeInstance: use a lock in freeNode" into lmp-mr1-dev
Wei Jia [Tue, 10 Oct 2017 21:02:53 +0000 (21:02 +0000)]
MediaExtractor: ensure users to check returned value by getTrack.
am:
46e359cbc0
Change-Id: I4a953b55c86be7590e7cf54b01b01c26e98aba19
Wei Jia [Tue, 10 Oct 2017 21:02:23 +0000 (21:02 +0000)]
Merge changes from topic "
b23270724" into lmp-dev
am:
5802bad0f4
Change-Id: Ia8bf24ccbc446fd0a66e132f914d9e3c835b87b9
Marco Nelissen [Tue, 10 Oct 2017 21:01:59 +0000 (21:01 +0000)]
Don't CHECK if the source can't be started
am:
711f83fa6c
Change-Id: Ib21b34c2c9707cfeb9a20a31417c84c9af8a585e
TreeHugger Robot [Tue, 10 Oct 2017 20:56:11 +0000 (20:56 +0000)]
Merge changes from topic "
b23270724" into lmp-dev
* changes:
MediaExtractor: ensure users to check returned value by getTrack.
Don't CHECK if the source can't be started
TreeHugger Robot [Tue, 10 Oct 2017 20:56:11 +0000 (20:56 +0000)]
Merge changes from topic "
b23270724" into nyc-dev
* changes:
Handle idle->loaded state transition when loaded->idle is still in progress
IMediaExtractor: ensure users to check returned value by getTrack.
Don't CHECK if the source can't be started
Fix issues with extractor dumpsys
Jeff Tinker [Tue, 10 Oct 2017 19:02:45 +0000 (19:02 +0000)]
Fix information disclosure in mediadrmserver
am:
b41a527176
Change-Id: Iee7d26d93e639cc7b7e0bb3de8b788090822a609
Jeff Tinker [Mon, 9 Oct 2017 18:52:18 +0000 (11:52 -0700)]
Fix information disclosure in mediadrmserver
Test:poc provided in bug
bug:
62872384
Change-Id: I3d104a2a64a0cb81e9fd5b04c4def1fbee64da2d
Eric Laurent [Thu, 5 Oct 2017 17:58:38 +0000 (10:58 -0700)]
Soundtrigger service: fix cross deadlock with audio policy service
Do not hold Module mutex when calling into audio policy manager to
avoid cross deadlock with audio poicy service mutex: Audio policy manager
can call into sound trigger service with its mutex held in methods like
stopInput().
Regression introduced by fix for b/
64340921 commit
f759b8c4
Bug:
64340921
Bug:
67310830
Test: repro steps in b/
67310830
Merged-In: Ie50b2e7c55fe9828a3fd8de6b31eb4a492791583
Change-Id: Ie50b2e7c55fe9828a3fd8de6b31eb4a492791583
Eric Laurent [Thu, 5 Oct 2017 17:58:38 +0000 (10:58 -0700)]
Soundtrigger service: fix cross deadlock with audio policy service
Do not hold Module mutex when calling into audio policy manager to
avoid cross deadlock with audio poicy service mutex: Audio policy manager
can call into sound trigger service with its mutex held in methods like
stopInput().
Regression introduced by fix for b/
64340921 commit
f759b8c4
Bug:
64340921
Bug:
67310830
Test: repro steps in b/
67310830
Merged-In: Ie50b2e7c55fe9828a3fd8de6b31eb4a492791583
Change-Id: Ie50b2e7c55fe9828a3fd8de6b31eb4a492791583
Eric Laurent [Thu, 5 Oct 2017 17:58:38 +0000 (10:58 -0700)]
Soundtrigger service: fix cross deadlock with audio policy service
Do not hold Module mutex when calling into audio policy manager to
avoid cross deadlock with audio poicy service mutex: Audio policy manager
can call into sound trigger service with its mutex held in methods like
stopInput().
Regression introduced by fix for b/
64340921 commit
f759b8c4
Bug:
64340921
Bug:
67310830
Test: repro steps in b/
67310830
Merged-In: Ie50b2e7c55fe9828a3fd8de6b31eb4a492791583
Change-Id: Ie50b2e7c55fe9828a3fd8de6b31eb4a492791583
Wonsik Kim [Wed, 4 Oct 2017 23:57:58 +0000 (23:57 +0000)]
Merge "m4v_h263: fix global buffer overflow" into lmp-dev
am:
c41471f6df
Change-Id: I7d699fe6c4067c992ab64f03c924b04d438f5c78
TreeHugger Robot [Wed, 4 Oct 2017 23:42:01 +0000 (23:42 +0000)]
Merge "m4v_h263: fix global buffer overflow" into lmp-dev
Julien Desprez [Tue, 26 Sep 2017 17:02:21 +0000 (17:02 +0000)]
Revert "Make stagefright command available for STS tests."
Bug:
66943976
This reverts commit
e286ff463b46ca987562adc9b24d49f1ee191b92.
Change-Id: I9704307962d86e82baf0215b60fadeaa1cc470df
Andres Celis [Wed, 20 Sep 2017 20:24:48 +0000 (13:24 -0700)]
Make stagefright command available for STS tests.
Bug:
65246490
Change-Id: If34d5e625181bd81bc112b1c9b519b2c0891740b
Marco Nelissen [Thu, 1 Sep 2016 22:11:57 +0000 (15:11 -0700)]
Handle idle->loaded state transition when loaded->idle is still in progress
Bug:
31156921
Bug:
23270724
Change-Id: I926cab482fadecb8bb885d85e0d083a4501596fd