git.osdn.net Git - android-x86/frameworks-av.git/log

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Eric Laurent [Thu, 19 Oct 2017 22:12:07 +0000 (22:12 +0000)]

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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