OSDN Git Service
android-build-team Robot [Thu, 19 Oct 2017 06:16:38 +0000 (06:16 +0000)]
Snap for
4404534 from
2921de78e6a7df365ed806cf4b98193862a97807 to oc-mr1-release
Change-Id: I0b8d5b04b7c42f3b46b1a036d95cc1cc352ec431
Jeff Tinker [Wed, 18 Oct 2017 21:47:38 +0000 (21:47 +0000)]
Fix information disclosure in mediadrmserver am:
b41a527176 am:
70dc77cc94 am:
e41b49b5ea am:
470e03a10b am:
d1e097f456 am:
32ae22ff0f am:
4e55c5aae0 am:
88e846c4e7 am:
acfb40f741 am:
e2f8930c39 am:
b3a0e4680b am:
3cf728e758
am:
650e3e6325
Change-Id: I9109b02acf15f7498523569e432141da23edd6c6
Wonsik Kim [Wed, 18 Oct 2017 21:45:44 +0000 (21:45 +0000)]
Merge "m4v_h263: fix global buffer overflow" into lmp-dev am:
c41471f6df am:
643dd1d8d4 am:
7648415fc8 am:
c52190750e am:
fa75c18493 am:
b722ff0037 am:
5a5be67306 am:
19594343c6 am:
1c2ff96c7d am:
580f133541 am:
b18c345695 am:
ca8d765f12
am:
d85a5aff43
Change-Id: Ib3ad13f8f774957551ceaf97e672145cf02b34dd
Marco Nelissen [Wed, 18 Oct 2017 21:44:10 +0000 (21:44 +0000)]
Merge "Fix memory leaks" into lmp-dev am:
3e913a793c am:
0ae16eb779 am:
cf520f4f9e am:
22b4aa34ea am:
a4856a624a am:
64fa39c01c am:
ffb8750131 am:
f2131eb33e am:
da750ecced am:
2e88fb1b72 am:
546cc40a5a am:
f777cb29a7
am:
5a6520b002
Change-Id: Ie555fb55d538be5caea4db36de0957fb333e82d4
Andy Hung [Wed, 18 Oct 2017 21:42:53 +0000 (21:42 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into lmp-dev am:
35a587cdc5 am:
27c4e661d4 -s ours am:
ac43fbe5a6 -s ours am:
f513923b38 -s ours am:
a421c87781 -s ours am:
310807ff52 -s ours am:
25c38b2f40 -s ours am:
550c14e0a4 -s ours am:
99555160ee -s ours am:
a0fd1b9e00 -s ours am:
d206dd91b0 -s ours am:
b040d5f2e3 -s ours
am:
4c1c9c8f5d -s ours
Change-Id: Idc31a3b59814b086ac6df3d3611620d4d65a3808
Dongwon Kang [Wed, 18 Oct 2017 21:41:11 +0000 (21:41 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into lmp-mr1-dev am:
94c1663ec9 -s ours am:
5bc8146ac4 -s ours am:
e3c114277f -s ours am:
dce95dc139 -s ours am:
2388b54423 -s ours am:
9f03c8306c -s ours am:
916f4ec913 -s ours am:
6c84ce30a5 -s ours am:
088e5bc9ff -s ours am:
8f0760e2a2 -s ours am:
6b106b0bf8 -s ours
am:
aa9c912440 -s ours
Change-Id: I8ec0a765a9e031f9e05f6af92a22210f19be3609
Andy Hung [Wed, 18 Oct 2017 21:39:30 +0000 (21:39 +0000)]
Merge "EffectBundle: Check parameter and value size" into lmp-dev am:
57ad9301e7 am:
d566fb1cbf am:
7c5acccded am:
25bd563ea6 am:
652b0f30d7 am:
4adc519e51 am:
2ef36a4500 am:
13252cc9a1 am:
fb683ef073 am:
54fb12c17f am:
863257bd64 -s ours am:
8ddcc1e85a -s ours
am:
1c01cadb83 -s ours
Change-Id: I0c9aa437ec0bdcb80464e82f0fcc3b3ff710de4c
Dongwon Kang [Wed, 18 Oct 2017 21:38:10 +0000 (21:38 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into lmp-dev am:
7b27979c5e -s ours am:
5095462e64 -s ours am:
12e787d348 -s ours am:
33d5c3961e -s ours am:
d4ebb1c11e -s ours am:
1e4f17cc7f -s ours am:
f683584e29 -s ours am:
4a969bc360 -s ours am:
52c241ed72 -s ours am:
c9cdb1e9a6 -s ours am:
72892c2b11 -s ours am:
4e1e297cd9 -s ours
am:
07e905cd72 -s ours
Change-Id: Ibf5e25c627d356a919c2d8bbdb4c9c159c62d7a7
Dongwon Kang [Wed, 18 Oct 2017 21:36:37 +0000 (21:36 +0000)]
Block allocateBackup if the node is not secure node. am:
996be3eef1 am:
2bebd9c7f5 am:
395ec8c4af am:
238f43188a am:
0a78e48503 am:
ff286981c5 -s ours am:
d7d971edb4 -s ours am:
6f8cfdcb21 -s ours am:
5511f6b6af -s ours am:
ff21c08650 -s ours am:
81baac0cb5 -s ours am:
420edf7c3b -s ours
am:
ca915d072e -s ours
Change-Id: If9adbf3040746bdd97868e124ae9e0fd398207dd
Jeff Tinker [Wed, 18 Oct 2017 21:30:07 +0000 (21:30 +0000)]
Fix information disclosure in mediadrmserver am:
b41a527176 am:
70dc77cc94 am:
e41b49b5ea am:
470e03a10b am:
d1e097f456 am:
32ae22ff0f am:
4e55c5aae0 am:
88e846c4e7 am:
acfb40f741 am:
e2f8930c39 am:
b3a0e4680b
am:
3cf728e758
Change-Id: I53e89f1f051e679cd7c6a5aa7cac2271231e435f
Wonsik Kim [Wed, 18 Oct 2017 21:28:41 +0000 (21:28 +0000)]
Merge "m4v_h263: fix global buffer overflow" into lmp-dev am:
c41471f6df am:
643dd1d8d4 am:
7648415fc8 am:
c52190750e am:
fa75c18493 am:
b722ff0037 am:
5a5be67306 am:
19594343c6 am:
1c2ff96c7d am:
580f133541 am:
b18c345695
am:
ca8d765f12
Change-Id: I6f8995534740d6a76a031bdbc940d01fd3ffbc54
Marco Nelissen [Wed, 18 Oct 2017 21:27:13 +0000 (21:27 +0000)]
Merge "Fix memory leaks" into lmp-dev am:
3e913a793c am:
0ae16eb779 am:
cf520f4f9e am:
22b4aa34ea am:
a4856a624a am:
64fa39c01c am:
ffb8750131 am:
f2131eb33e am:
da750ecced am:
2e88fb1b72 am:
546cc40a5a
am:
f777cb29a7
Change-Id: I7e600d301a194038596a5e08081b02dbed05db8d
Andy Hung [Wed, 18 Oct 2017 21:25:57 +0000 (21:25 +0000)]
Merge "AudioPolicyService: Acquire mutex for SoundTriggerSession" into lmp-dev am:
35a587cdc5 am:
27c4e661d4 -s ours am:
ac43fbe5a6 -s ours am:
f513923b38 -s ours am:
a421c87781 -s ours am:
310807ff52 -s ours am:
25c38b2f40 -s ours am:
550c14e0a4 -s ours am:
99555160ee -s ours am:
a0fd1b9e00 -s ours am:
d206dd91b0 -s ours
am:
b040d5f2e3 -s ours
Change-Id: I64519a1369358836584a94fdae46f6cf6fa36385
Dongwon Kang [Wed, 18 Oct 2017 21:22:48 +0000 (21:22 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into lmp-mr1-dev am:
94c1663ec9 -s ours am:
5bc8146ac4 -s ours am:
e3c114277f -s ours am:
dce95dc139 -s ours am:
2388b54423 -s ours am:
9f03c8306c -s ours am:
916f4ec913 -s ours am:
6c84ce30a5 -s ours am:
088e5bc9ff -s ours am:
8f0760e2a2 -s ours
am:
6b106b0bf8 -s ours
Change-Id: Ie76a285c6392f9945399e9be88b663bb803b0f2c
Andy Hung [Wed, 18 Oct 2017 21:21:38 +0000 (21:21 +0000)]
Merge "EffectBundle: Check parameter and value size" into lmp-dev am:
57ad9301e7 am:
d566fb1cbf am:
7c5acccded am:
25bd563ea6 am:
652b0f30d7 am:
4adc519e51 am:
2ef36a4500 am:
13252cc9a1 am:
fb683ef073 am:
54fb12c17f am:
863257bd64 -s ours
am:
8ddcc1e85a -s ours
Change-Id: I1518eaa091b016c94c467426f664b67102cb51d4
Dongwon Kang [Wed, 18 Oct 2017 21:20:06 +0000 (21:20 +0000)]
Merge "Track graphic buffer mode in OMXNodeInstance" into lmp-dev am:
7b27979c5e -s ours am:
5095462e64 -s ours am:
12e787d348 -s ours am:
33d5c3961e -s ours am:
d4ebb1c11e -s ours am:
1e4f17cc7f -s ours am:
f683584e29 -s ours am:
4a969bc360 -s ours am:
52c241ed72 -s ours am:
c9cdb1e9a6 -s ours am:
72892c2b11 -s ours
am:
4e1e297cd9 -s ours
Change-Id: I39c304777dd4a35bf8abf6a8006c533be1f57614
Dongwon Kang [Wed, 18 Oct 2017 21:18:33 +0000 (21:18 +0000)]
Block allocateBackup if the node is not secure node. am:
996be3eef1 am:
2bebd9c7f5 am:
395ec8c4af am:
238f43188a am:
0a78e48503 am:
ff286981c5 -s ours am:
d7d971edb4 -s ours am:
6f8cfdcb21 -s ours am:
5511f6b6af -s ours am:
ff21c08650 -s ours am:
81baac0cb5 -s ours
am:
420edf7c3b -s ours
Change-Id: I124beff88cab4d808796688abf29ae9849d6130f
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
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
android-build-team Robot [Wed, 18 Oct 2017 07:20:58 +0000 (07:20 +0000)]
Snap for
4402249 from
d7d6df849cec9d0a9c1fd0d9957a1b8edef361b7 to oc-mr1-release
Change-Id: Ia1eee4026007d190e50f9ef3a8555c656d1c5af0
Lajos Molnar [Mon, 16 Oct 2017 21:47:31 +0000 (14:47 -0700)]
stagefright: MP4Extractor: allow 10% overhead on default sample size
Bug:
64528824
Change-Id: Id19ec0d634d9337190d04abdbd97842b66502c01
android-build-team Robot [Wed, 11 Oct 2017 07:21:22 +0000 (07:21 +0000)]
Snap for
4388906 from
e3c46b0a49d045fa38d35e5cf7ad4becaacbbed6 to oc-mr1-release
Change-Id: Idf8a19c496af8b724e0567d948ce219375e43441