OSDN Git Service
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
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
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
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
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
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
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
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: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
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
Wei Jia [Tue, 10 Oct 2017 22:56:46 +0000 (22:56 +0000)]
MediaExtractor: ensure users to check returned value by getTrack. am:
46e359cbc0 am:
1fad937a9c am:
7b66ddb747 am:
6c15ae2aa9 -s ours am:
41392611b5 am:
0b6424a441
am:
b9e0bdb6e8
Change-Id: Id003ce3e6655581041f2a427408b177f1235f431
Marco Nelissen [Tue, 10 Oct 2017 22:54:58 +0000 (22:54 +0000)]
Don't CHECK if the source can't be started am:
711f83fa6c am:
c3f16a62a2 am:
0ada8e950b am:
efcbb62657 -s ours am:
769a422071 am:
4797f02aee
am:
d951771d27
Change-Id: I7345add98dd4856771587bd5b42179fe76bf5032
Wei Jia [Tue, 10 Oct 2017 22:41:24 +0000 (22:41 +0000)]
MediaExtractor: ensure users to check returned value by getTrack. am:
46e359cbc0 am:
1fad937a9c am:
7b66ddb747 am:
6c15ae2aa9 -s ours am:
41392611b5
am:
0b6424a441
Change-Id: I37a115a1778d1852401427cd2a7c16299c8c60f4
Marco Nelissen [Tue, 10 Oct 2017 22:40:41 +0000 (22:40 +0000)]
Don't CHECK if the source can't be started am:
711f83fa6c am:
c3f16a62a2 am:
0ada8e950b am:
efcbb62657 -s ours am:
769a422071
am:
4797f02aee
Change-Id: I27dea01e8c38ea4768043d5b1f1075e75fe36581
Wei Jia [Tue, 10 Oct 2017 22:33:02 +0000 (22:33 +0000)]
MediaExtractor: ensure users to check returned value by getTrack. am:
46e359cbc0 am:
1fad937a9c am:
7b66ddb747 am:
6c15ae2aa9 -s ours
am:
41392611b5
Change-Id: I5a120cc1fc60d9e4d47efe4c953286eb8dc6b3f2
Marco Nelissen [Tue, 10 Oct 2017 22:32:13 +0000 (22:32 +0000)]
Don't CHECK if the source can't be started am:
711f83fa6c am:
c3f16a62a2 am:
0ada8e950b am:
efcbb62657 -s ours
am:
769a422071
Change-Id: I78f95557dfa60537f1a8da92b6c5f8668f18a4c8
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
Eric Laurent [Tue, 10 Oct 2017 22:08:14 +0000 (22:08 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into nyc-dev am:
dbda8a95eb am:
7f0263ba2d
am:
31ac3bd137
Change-Id: Ia824880f1020c46b30989325d154f88134cbdaed
Marco Nelissen [Tue, 10 Oct 2017 22:04:53 +0000 (22:04 +0000)]
Merge changes from topic "
b23270724" into nyc-dev am:
45a05eb567 am:
e79b2f044c -s ours
am:
4758facf28
Change-Id: Ie6a6ff729b8d5461f86a7ab9e3dbb6f04f4659b5
Eric Laurent [Tue, 10 Oct 2017 22:01:19 +0000 (22:01 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into nyc-dev am:
dbda8a95eb
am:
7f0263ba2d
Change-Id: I1777f119f17e359bead997c1bd043e1554c5125c
Marco Nelissen [Tue, 10 Oct 2017 21:57:23 +0000 (21:57 +0000)]
Merge changes from topic "
b23270724" into nyc-dev am:
45a05eb567
am:
e79b2f044c -s ours
Change-Id: I39d12c1761c74291eead9f98fc3a7409a79b2c43
Eric Laurent [Tue, 10 Oct 2017 21:30:46 +0000 (21:30 +0000)]
Merge "Soundtrigger service: fix cross deadlock with audio policy service" into nyc-dev
am:
dbda8a95eb
Change-Id: I325b9ad452b2ee6da8368ad5951fc37cad80723f
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
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:02:10 +0000 (21:02 +0000)]
Merge changes from topic "
b23270724" into nyc-dev
am:
45a05eb567
Change-Id: Iee4799062b31b85d92fd2a1ca9ca1000839bc7e6
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 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
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
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
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
OSDN Git Service
