OSDN Git Service
Andy Hung [Sat, 3 Dec 2016 01:05:24 +0000 (01:05 +0000)]
Merge "Effect: Use local cached data for Effect commit" into klp-dev am:
1576f5968c am:
308e51173e am:
94d5167a91 am:
98c2151dc3 am:
110d4d31b3 am:
71840c6a36 am:
ec982d4628 am:
21556821c9 am:
be0097ba0f am:
f462a8c127 am:
f574a9722f am:
15d9e5097e am:
5ed0c9ffda
am:
342652c245
Change-Id: Ic8f0ae2633b26411a3085956e682cb0cde753e14
Andy Hung [Sat, 3 Dec 2016 01:05:06 +0000 (01:05 +0000)]
Effect: Use local cached data for Effect commit am:
dd79ccda92 am:
82c8c7656f am:
9851dee7da am:
4242950061 am:
a661c82829 am:
b45c856249 am:
39ca98f547 am:
9ea4b8abdf am:
25813f0a7a am:
1155d119b4 am:
70dc13599d am:
2fd05aa3f0 am:
79366efacc
am:
f319a8fa1a
Change-Id: Ic86107d8fbd5f73da988f6db1af8c8789bc357bf
Andy Hung [Sat, 3 Dec 2016 01:02:54 +0000 (01:02 +0000)]
Merge "Effect: Use local cached data for Effect commit" into klp-dev am:
1576f5968c am:
308e51173e am:
94d5167a91 am:
98c2151dc3 am:
110d4d31b3 am:
71840c6a36 am:
ec982d4628 am:
21556821c9 am:
be0097ba0f am:
f462a8c127 am:
f574a9722f am:
15d9e5097e
am:
5ed0c9ffda
Change-Id: Ieba62212da1f778a12c376e389670100c5e69fc7
Andy Hung [Sat, 3 Dec 2016 01:02:36 +0000 (01:02 +0000)]
Effect: Use local cached data for Effect commit am:
dd79ccda92 am:
82c8c7656f am:
9851dee7da am:
4242950061 am:
a661c82829 am:
b45c856249 am:
39ca98f547 am:
9ea4b8abdf am:
25813f0a7a am:
1155d119b4 am:
70dc13599d am:
2fd05aa3f0
am:
79366efacc
Change-Id: Ie66c50bd9ec53164aa41462bfcf406d0d265683b
Andy Hung [Sat, 3 Dec 2016 01:00:50 +0000 (01:00 +0000)]
Merge "Effect: Use local cached data for Effect commit" into klp-dev am:
1576f5968c am:
308e51173e am:
94d5167a91 am:
98c2151dc3 am:
110d4d31b3 am:
71840c6a36 am:
ec982d4628 am:
21556821c9 am:
be0097ba0f am:
f462a8c127 am:
f574a9722f
am:
15d9e5097e
Change-Id: I0065f5856dba9aa6da8539fc7e505716e479f3ab
Andy Hung [Sat, 3 Dec 2016 01:00:35 +0000 (01:00 +0000)]
Effect: Use local cached data for Effect commit am:
dd79ccda92 am:
82c8c7656f am:
9851dee7da am:
4242950061 am:
a661c82829 am:
b45c856249 am:
39ca98f547 am:
9ea4b8abdf am:
25813f0a7a am:
1155d119b4 am:
70dc13599d
am:
2fd05aa3f0
Change-Id: Ic3a3443d71ac628d5727970b75d65c4e29813a14
Andy Hung [Sat, 3 Dec 2016 00:58:23 +0000 (00:58 +0000)]
Merge "Effect: Use local cached data for Effect commit" into klp-dev am:
1576f5968c am:
308e51173e am:
94d5167a91 am:
98c2151dc3 am:
110d4d31b3 am:
71840c6a36 am:
ec982d4628 am:
21556821c9 am:
be0097ba0f am:
f462a8c127
am:
f574a9722f
Change-Id: I64e7cd2deb23b2a89b696a3b92304cf1af78d0dc
Andy Hung [Sat, 3 Dec 2016 00:58:05 +0000 (00:58 +0000)]
Effect: Use local cached data for Effect commit am:
dd79ccda92 am:
82c8c7656f am:
9851dee7da am:
4242950061 am:
a661c82829 am:
b45c856249 am:
39ca98f547 am:
9ea4b8abdf am:
25813f0a7a am:
1155d119b4
am:
70dc13599d
Change-Id: I0cb9e61f3bad85c85f433ae0bd7dbd5ef74afa34
Andy Hung [Sat, 3 Dec 2016 00:56:22 +0000 (00:56 +0000)]
Merge "Effect: Use local cached data for Effect commit" into klp-dev am:
1576f5968c am:
308e51173e am:
94d5167a91 am:
98c2151dc3 am:
110d4d31b3 am:
71840c6a36 am:
ec982d4628 am:
21556821c9 am:
be0097ba0f
am:
f462a8c127
Change-Id: I0bc2c2cface0464b4d05e90f5115df1016206500
Andy Hung [Sat, 3 Dec 2016 00:56:04 +0000 (00:56 +0000)]
Effect: Use local cached data for Effect commit am:
dd79ccda92 am:
82c8c7656f am:
9851dee7da am:
4242950061 am:
a661c82829 am:
b45c856249 am:
39ca98f547 am:
9ea4b8abdf am:
25813f0a7a
am:
1155d119b4
Change-Id: Ia29bfe12f493e94b451b973e8e027007630b4c55
Andy Hung [Sat, 3 Dec 2016 00:53:51 +0000 (00:53 +0000)]
Merge "Effect: Use local cached data for Effect commit" into klp-dev am:
1576f5968c am:
308e51173e am:
94d5167a91 am:
98c2151dc3 am:
110d4d31b3 am:
71840c6a36 am:
ec982d4628 am:
21556821c9
am:
be0097ba0f
Change-Id: Idbff578bea011b744f5fc729ace6fe3e03d155d4
Andy Hung [Sat, 3 Dec 2016 00:53:35 +0000 (00:53 +0000)]
Effect: Use local cached data for Effect commit am:
dd79ccda92 am:
82c8c7656f am:
9851dee7da am:
4242950061 am:
a661c82829 am:
b45c856249 am:
39ca98f547 am:
9ea4b8abdf
am:
25813f0a7a
Change-Id: I7232cde71eb075f5446d3a1297cb73f9197f9f38
Andy Hung [Sat, 3 Dec 2016 00:51:52 +0000 (00:51 +0000)]
Merge "Effect: Use local cached data for Effect commit" into klp-dev am:
1576f5968c am:
308e51173e am:
94d5167a91 am:
98c2151dc3 am:
110d4d31b3 am:
71840c6a36 am:
ec982d4628
am:
21556821c9
Change-Id: I6e8aedd746761799ce24f0b51859a8ad1c2aa9f8
Andy Hung [Sat, 3 Dec 2016 00:51:33 +0000 (00:51 +0000)]
Effect: Use local cached data for Effect commit am:
dd79ccda92 am:
82c8c7656f am:
9851dee7da am:
4242950061 am:
a661c82829 am:
b45c856249 am:
39ca98f547
am:
9ea4b8abdf
Change-Id: I71203acd393a5104c121d1d3c91ee84c5af64143
Andy Hung [Sat, 3 Dec 2016 00:49:19 +0000 (00:49 +0000)]
Merge "Effect: Use local cached data for Effect commit" into klp-dev am:
1576f5968c am:
308e51173e am:
94d5167a91 am:
98c2151dc3 am:
110d4d31b3 am:
71840c6a36
am:
ec982d4628
Change-Id: Ie333d2a27f06bd7feaaef72cdc437df2d41da524
Andy Hung [Sat, 3 Dec 2016 00:49:03 +0000 (00:49 +0000)]
Effect: Use local cached data for Effect commit am:
dd79ccda92 am:
82c8c7656f am:
9851dee7da am:
4242950061 am:
a661c82829 am:
b45c856249
am:
39ca98f547
Change-Id: Id699ab91ec473ee08de7782e8c606209b6372fe5
Andy Hung [Sat, 3 Dec 2016 00:47:21 +0000 (00:47 +0000)]
Merge "Effect: Use local cached data for Effect commit" into klp-dev am:
1576f5968c am:
308e51173e am:
94d5167a91 am:
98c2151dc3 am:
110d4d31b3
am:
71840c6a36
Change-Id: Idcef3a5a9a0adb89bcffa1c5e1b4e0bcbd7fb880
Andy Hung [Sat, 3 Dec 2016 00:47:04 +0000 (00:47 +0000)]
Effect: Use local cached data for Effect commit am:
dd79ccda92 am:
82c8c7656f am:
9851dee7da am:
4242950061 am:
a661c82829
am:
b45c856249
Change-Id: I6cb0c8e2dbaa2ebe3d4fd4f283a2028ac099f3c3
Andy Hung [Sat, 3 Dec 2016 00:45:17 +0000 (00:45 +0000)]
Merge "Effect: Use local cached data for Effect commit" into klp-dev am:
1576f5968c am:
308e51173e am:
94d5167a91 am:
98c2151dc3
am:
110d4d31b3
Change-Id: Id0e2e230e2ccd08f46cfd33cab5d7585e9623cf0
Andy Hung [Sat, 3 Dec 2016 00:45:02 +0000 (00:45 +0000)]
Effect: Use local cached data for Effect commit am:
dd79ccda92 am:
82c8c7656f am:
9851dee7da am:
4242950061
am:
a661c82829
Change-Id: I8318ec70f93d1ed10b5606511eb2d1885121f355
Andy Hung [Sat, 3 Dec 2016 00:42:49 +0000 (00:42 +0000)]
Merge "Effect: Use local cached data for Effect commit" into klp-dev am:
1576f5968c am:
308e51173e am:
94d5167a91
am:
98c2151dc3
Change-Id: I0105fd0ddab374f8d1e95cc9e45af094367edd30
Andy Hung [Sat, 3 Dec 2016 00:42:33 +0000 (00:42 +0000)]
Effect: Use local cached data for Effect commit am:
dd79ccda92 am:
82c8c7656f am:
9851dee7da
am:
4242950061
Change-Id: I9cee35a3c8df1747c5461dc62c3210a0de134b87
Andy Hung [Sat, 3 Dec 2016 00:40:47 +0000 (00:40 +0000)]
Merge "Effect: Use local cached data for Effect commit" into klp-dev am:
1576f5968c am:
308e51173e
am:
94d5167a91
Change-Id: I3a4af7a28adcd54d4590f447845b134acb80f053
Andy Hung [Sat, 3 Dec 2016 00:40:33 +0000 (00:40 +0000)]
Effect: Use local cached data for Effect commit am:
dd79ccda92 am:
82c8c7656f
am:
9851dee7da
Change-Id: I3d375c671122e61cf0b530457c37c1cd5c06e563
Andy Hung [Sat, 3 Dec 2016 00:38:50 +0000 (00:38 +0000)]
Merge "Effect: Use local cached data for Effect commit" into klp-dev am:
1576f5968c
am:
308e51173e
Change-Id: I7d741aa81543b95a6c3aeada9a259ba5a4c9b5bb
Andy Hung [Sat, 3 Dec 2016 00:38:33 +0000 (00:38 +0000)]
Effect: Use local cached data for Effect commit am:
dd79ccda92
am:
82c8c7656f
Change-Id: I8819bc1146b0b751abc0790edd4b7d73f2198038
Andy Hung [Sat, 3 Dec 2016 00:36:02 +0000 (00:36 +0000)]
Merge "Effect: Use local cached data for Effect commit" into klp-dev
am:
1576f5968c
Change-Id: I3310e7efeb0bcd1826d112e94e13f46ce5234755
Andy Hung [Sat, 3 Dec 2016 00:36:01 +0000 (00:36 +0000)]
Effect: Use local cached data for Effect commit
am:
dd79ccda92
Change-Id: Ide8165907e03b9d400eaa33a222ceeae782d6509
Andy Hung [Sat, 3 Dec 2016 00:32:27 +0000 (00:32 +0000)]
Merge "Effect: Use local cached data for Effect commit" into klp-dev
Pavlin Radoslavov [Fri, 2 Dec 2016 07:44:35 +0000 (07:44 +0000)]
Merge "Add a mechanism for Audio Feeding Parameters negotiation" am:
653748414b
am:
1081e9ac62
Change-Id: Iafbd0d46b69cdd9a98e288f1e03d58c25111c23b
Pavlin Radoslavov [Fri, 2 Dec 2016 07:37:05 +0000 (07:37 +0000)]
Merge "Add a mechanism for Audio Feeding Parameters negotiation"
am:
653748414b
Change-Id: Id6855d139a248d15ec0ea0ee0f01cf7655862ac7
Treehugger Robot [Fri, 2 Dec 2016 07:25:29 +0000 (07:25 +0000)]
Merge "Add a mechanism for Audio Feeding Parameters negotiation"
Pavlin Radoslavov [Tue, 22 Nov 2016 20:13:59 +0000 (12:13 -0800)]
Add a mechanism for Audio Feeding Parameters negotiation
Previously, the Audio Feeding Parameters between the Media Framework
and A2DP were hard-coded: 44.1 KHz sample rate, 16-bits per sample, Stereo.
Now the Media Framework queries A2DP, and uses the returned values.
Bug: b/
30958229
Test: Manual testing: A2DP streaming to headphones. TestTracker/68727
Change-Id: Ib86035814c49f773b7ed3d64da334ca9ea87eb14
Caroline Tice [Thu, 1 Dec 2016 21:35:25 +0000 (21:35 +0000)]
Merge "Remove null-ptr deref compiler warning." am:
b4d217ed0f
am:
1095908b34
Change-Id: Ie4ee8c1462415b89c96e3a6ade42fa60c6a67a1a
Caroline Tice [Thu, 1 Dec 2016 21:28:18 +0000 (21:28 +0000)]
Merge "Remove null-ptr deref compiler warning."
am:
b4d217ed0f
Change-Id: Iaa009b250224afa46e7220c44054ae1755d897bd
Treehugger Robot [Thu, 1 Dec 2016 21:10:12 +0000 (21:10 +0000)]
Merge "Remove null-ptr deref compiler warning."
Caroline Tice [Thu, 1 Dec 2016 00:20:52 +0000 (16:20 -0800)]
Remove null-ptr deref compiler warning.
This CL removes the following compiler warning:
frameworks/av/media/libstagefright/MPEG4Extractor.cpp:1025:35
warning: Access to field 'next' results in a dereference of a null
pointer (loaded from variable 'cur')
[clang-analyzer-core.NullDereference]
Bug: None
Test: Compiled with change and no warning.
Change-Id: I365843068b098b111c281ac293a0b0b3aa2ec875
rago [Wed, 30 Nov 2016 20:21:25 +0000 (20:21 +0000)]
Fix security vulnerability: potential OOB write in audioserver am:
e275907e57 am:
01e854056a am:
3e8ab60b7f am:
9161586309 am:
ad29b47d91 am:
8b9b199891 am:
72729c449d am:
97bb7fe084 am:
3d6aada999 am:
ffe82a3b4a am:
ec601622f8 am:
f50635bdc4 am:
f1e829a54e
am:
a2e95f5c9b
Change-Id: Ic25053a111913dfd4490633b9f0eff1e7fe1d359
rago [Wed, 30 Nov 2016 20:16:26 +0000 (20:16 +0000)]
Fix security vulnerability: potential OOB write in audioserver am:
e275907e57 am:
01e854056a am:
3e8ab60b7f am:
9161586309 am:
ad29b47d91 am:
8b9b199891 am:
72729c449d am:
97bb7fe084 am:
3d6aada999 am:
ffe82a3b4a am:
ec601622f8 am:
f50635bdc4
am:
f1e829a54e
Change-Id: I71c6e9e07cbaa40dd4ac535ff43813d8cfa44a30
rago [Wed, 30 Nov 2016 20:10:54 +0000 (20:10 +0000)]
Fix security vulnerability: potential OOB write in audioserver am:
e275907e57 am:
01e854056a am:
3e8ab60b7f am:
9161586309 am:
ad29b47d91 am:
8b9b199891 am:
72729c449d am:
97bb7fe084 am:
3d6aada999 am:
ffe82a3b4a am:
ec601622f8
am:
f50635bdc4
Change-Id: I2a763c6477374600f84d5c3aae646af395b947c5
rago [Wed, 30 Nov 2016 20:05:22 +0000 (20:05 +0000)]
Fix security vulnerability: potential OOB write in audioserver am:
e275907e57 am:
01e854056a am:
3e8ab60b7f am:
9161586309 am:
ad29b47d91 am:
8b9b199891 am:
72729c449d am:
97bb7fe084 am:
3d6aada999 am:
ffe82a3b4a
am:
ec601622f8
Change-Id: I406374de32920003302cff5a78c0ced400dacbdc
rago [Wed, 30 Nov 2016 20:00:23 +0000 (20:00 +0000)]
Fix security vulnerability: potential OOB write in audioserver am:
e275907e57 am:
01e854056a am:
3e8ab60b7f am:
9161586309 am:
ad29b47d91 am:
8b9b199891 am:
72729c449d am:
97bb7fe084 am:
3d6aada999
am:
ffe82a3b4a
Change-Id: I428d5c72ea37518c30d50d21b1ef47e440933cde
rago [Wed, 30 Nov 2016 19:55:22 +0000 (19:55 +0000)]
Fix security vulnerability: potential OOB write in audioserver am:
e275907e57 am:
01e854056a am:
3e8ab60b7f am:
9161586309 am:
ad29b47d91 am:
8b9b199891 am:
72729c449d am:
97bb7fe084
am:
3d6aada999
Change-Id: Id7d701e1a6189cb674b75895a430b260d9e0690c
rago [Wed, 30 Nov 2016 19:49:21 +0000 (19:49 +0000)]
Fix security vulnerability: potential OOB write in audioserver am:
e275907e57 am:
01e854056a am:
3e8ab60b7f am:
9161586309 am:
ad29b47d91 am:
8b9b199891 am:
72729c449d
am:
97bb7fe084
Change-Id: I324b70466e9306fe724bd858f4f70edea8637cc6
rago [Wed, 30 Nov 2016 19:44:50 +0000 (19:44 +0000)]
Fix security vulnerability: potential OOB write in audioserver am:
e275907e57 am:
01e854056a am:
3e8ab60b7f am:
9161586309 am:
ad29b47d91 am:
8b9b199891
am:
72729c449d
Change-Id: I97c6b4935971fa201e5107940643eaf0355bcaaa
rago [Wed, 30 Nov 2016 19:38:50 +0000 (19:38 +0000)]
Fix security vulnerability: potential OOB write in audioserver am:
e275907e57 am:
01e854056a am:
3e8ab60b7f am:
9161586309 am:
ad29b47d91
am:
8b9b199891
Change-Id: Id1d62d9ebabab42f5ca82ff2fbbcf14d130466f4
rago [Wed, 30 Nov 2016 19:34:20 +0000 (19:34 +0000)]
Fix security vulnerability: potential OOB write in audioserver am:
e275907e57 am:
01e854056a am:
3e8ab60b7f am:
9161586309
am:
ad29b47d91
Change-Id: I7ea2eaa2b1fb4cf652b702e847b2a83e777858ef
rago [Wed, 30 Nov 2016 19:28:49 +0000 (19:28 +0000)]
Fix security vulnerability: potential OOB write in audioserver am:
e275907e57 am:
01e854056a am:
3e8ab60b7f
am:
9161586309
Change-Id: Ibcceb08d7db77f67f3dfc3cdad1d2bd6994183ae
rago [Wed, 30 Nov 2016 19:23:21 +0000 (19:23 +0000)]
Fix security vulnerability: potential OOB write in audioserver am:
e275907e57 am:
01e854056a
am:
3e8ab60b7f
Change-Id: Ib575df34ec5bb7dc2cd83a859e10abe94e894317
Yin-Chia Yeh [Wed, 30 Nov 2016 19:18:45 +0000 (19:18 +0000)]
Merge "Camera: fix camera facing override logic" am:
853f568b31
am:
f02844c434
Change-Id: I0f136beed5de56795e20b14bbe2e64c4290d0e99
rago [Wed, 30 Nov 2016 19:17:48 +0000 (19:17 +0000)]
Fix security vulnerability: potential OOB write in audioserver am:
e275907e57
am:
01e854056a
Change-Id: I7ea6a871eed4b9e1c56c5350c4e5fb5eb628e816
Yin-Chia Yeh [Wed, 30 Nov 2016 19:13:02 +0000 (19:13 +0000)]
Merge "Camera: fix camera facing override logic"
am:
853f568b31
Change-Id: I5028a6f298eb2c961556760b6ea248c673c13ba6
rago [Wed, 30 Nov 2016 19:12:17 +0000 (19:12 +0000)]
Fix security vulnerability: potential OOB write in audioserver
am:
e275907e57
Change-Id: I38086dbaeeef1c068887cc20aca9d557bb159372
Treehugger Robot [Wed, 30 Nov 2016 19:00:16 +0000 (19:00 +0000)]
Merge "Camera: fix camera facing override logic"
Yin-Chia Yeh [Tue, 29 Nov 2016 20:13:15 +0000 (12:13 -0800)]
Camera: fix camera facing override logic
Test: hack existing HAL to report EXTERNAL and run cts
Bug:
33091893
Change-Id: Idae8742fb4b18b2ef4842ec66284268fc650df22
rago [Wed, 23 Nov 2016 02:02:48 +0000 (18:02 -0800)]
Fix security vulnerability: potential OOB write in audioserver
Bug:
32705438
Bug:
32703959
Test: cts security test
Change-Id: I8900c92fa55b56c4c2c9d721efdbabe6bfc8a4a4
Baligh Uddin [Wed, 23 Nov 2016 17:56:24 +0000 (17:56 +0000)]
Merge "Merge remote-tracking branch 'goog/cw-f-dev' into fix_merger" into nyc-mr1-dev-plus-aosp
Yunlian Jiang [Wed, 23 Nov 2016 04:27:13 +0000 (04:27 +0000)]
Merge "fix Potential leak of memory pointed to by 'sourcesLiteral'" am:
fa81ba8775
am:
e16a2029e0
Change-Id: Ie4a21ca93e7aca9fa09671617cc73623af941475
Caroline Tice [Wed, 23 Nov 2016 04:26:58 +0000 (04:26 +0000)]
Merge "Fix null-pointer derefernce warning." am:
955e85294d
am:
c12499d5c6
Change-Id: I26217d347ee091d4f39c50be99062ddc3d9ae850
Yunlian Jiang [Wed, 23 Nov 2016 04:24:47 +0000 (04:24 +0000)]
Merge "fix Potential leak of memory pointed to by 'sourcesLiteral'"
am:
fa81ba8775
Change-Id: I7d261ceb8cfce3b3f56ed907e1e32d70e7a40d45
Caroline Tice [Wed, 23 Nov 2016 04:24:30 +0000 (04:24 +0000)]
Merge "Fix null-pointer derefernce warning."
am:
955e85294d
Change-Id: I492db6e2ea9cbe052f4120aba3477052ad791a29
Treehugger Robot [Wed, 23 Nov 2016 04:18:14 +0000 (04:18 +0000)]
Merge "fix Potential leak of memory pointed to by 'sourcesLiteral'"
Treehugger Robot [Wed, 23 Nov 2016 04:17:17 +0000 (04:17 +0000)]
Merge "Fix null-pointer derefernce warning."
Baligh Uddin [Wed, 23 Nov 2016 01:14:57 +0000 (17:14 -0800)]
Merge remote-tracking branch 'goog/cw-f-dev' into fix_merger
Bug:
32849428
* goog/cw-f-dev:
If a device does not have a camera, do not set a camera death notifier
Fix security vulnerability: Effect command might allow negative indexes
Make VBRISeeker more robust
DO NOT MERGE: defensive parsing of mp3 album art information
Effects: Check get parameter command size
IOMX: convert ANWB to Gralloc meta if using useBuffer in the same process
DO NOT MERGE: defensive parsing of mp3 album art information
DO NOT MERGE: defensive parsing of mp3 album art information
DO NOT MERGE: defensive parsing of mp3 album art information
DO NOT MERGE: defensive parsing of mp3 album art information
Camera API1: don't pick wrong preview fps value
Fix security vulnerability: Equalizer command might allow negative indexes
Camera API1: relax the fps check with some margin
stagefright: remove allottedSize equality check in IOMX::useBuffer
Camera API1: filter out the unsupported preview fps range
DO NOT MERGE: Visualizer: Check capture size and latency parameters
Visualizer: Check capture size and latency parameters
Jinguang Dong [Tue, 22 Nov 2016 18:44:52 +0000 (18:44 +0000)]
Merge "framework/av: fixbug for mistake clear mainbuffer data, root cause by not offset to fout" am:
25ef483a8c
am:
c7ad5838d2
Change-Id: Ide8d0d93cb54274f10f2a2e46b15693a73d77ef0
Jinguang Dong [Tue, 22 Nov 2016 18:41:21 +0000 (18:41 +0000)]
Merge "framework/av: fixbug for mistake clear mainbuffer data, root cause by not offset to fout"
am:
25ef483a8c
Change-Id: I6c8ee1c28b51f1578a781fdc7dd1d51326046d2f
Treehugger Robot [Tue, 22 Nov 2016 18:37:03 +0000 (18:37 +0000)]
Merge "framework/av: fixbug for mistake clear mainbuffer data, root cause by not offset to fout"
Jinguang Dong [Mon, 14 Nov 2016 11:57:14 +0000 (19:57 +0800)]
framework/av: fixbug for mistake clear mainbuffer data,
root cause by not offset to fout
Test: 1. pair and connect with bluetooth ear phone;
2. record video by camera ,play and pause again by
loop test;
3. Checking whether ear phone has pop sound.
Change-Id: Ief4117d634b9e7a9f27c669b8de7626b15df7636
Dan Willemsen [Fri, 18 Nov 2016 23:32:02 +0000 (23:32 +0000)]
Merge "Remove LOCAL_COPY_HEADERS from libparameter" am:
76321a335c
am:
d5eb866c53
Change-Id: I3b209c602c5a9e1d2117f580723de1d381b54617
Dan Willemsen [Fri, 18 Nov 2016 23:28:33 +0000 (23:28 +0000)]
Merge "Remove LOCAL_COPY_HEADERS from libparameter"
am:
76321a335c
Change-Id: Ie99187aa91ddb1a9fa199dcf681edd4565cc0d1b
Treehugger Robot [Fri, 18 Nov 2016 23:19:25 +0000 (23:19 +0000)]
Merge "Remove LOCAL_COPY_HEADERS from libparameter"
Dan Willemsen [Fri, 18 Nov 2016 21:28:36 +0000 (13:28 -0800)]
Remove LOCAL_COPY_HEADERS from libparameter
Requires the libaudiopolicypfwwrapper to depend on libparameter to get
the exported headers. Also fix the libaudiopolicyengineconfigurable
build to resolve missing liblog symbols.
Test: USE_CONFIGURABLE_AUDIO_POLICY=1 mmma -j frameworks/av/services/audiopolicy
Tom Rudick [Fri, 18 Nov 2016 16:32:45 +0000 (11:32 -0500)]
If a device does not have a camera, do not set a camera death notifier
getService("media.camera") will return a NULL binder if there is no
camera service present. This will result in a segfault when we
attempt to set the DeathListener on the binder. If the camera
binder is NULL, we should not attempt to set a notifier.
Bug:
32742216
Bug:
32742421
Change-Id: Id6e7cabdd9e2f0f5d44f4ce435121f84d891026a
Jinguang Dong [Thu, 17 Nov 2016 19:19:48 +0000 (19:19 +0000)]
Merge "Camera3: Add missing mTriggerMutex lock" am:
ad4663c5a5
am:
fa43b5468f
Change-Id: I588e89df0dd601c3f3ca531b2ce2b2b997335cee
Jinguang Dong [Thu, 17 Nov 2016 19:12:18 +0000 (19:12 +0000)]
Merge "Camera3: Add missing mTriggerMutex lock"
am:
ad4663c5a5
Change-Id: I59b7de9cdd9f608afa503293947a19d3f11d533b
Treehugger Robot [Thu, 17 Nov 2016 19:02:13 +0000 (19:02 +0000)]
Merge "Camera3: Add missing mTriggerMutex lock"
Robert Shih [Thu, 17 Nov 2016 18:02:43 +0000 (18:02 +0000)]
Merge "httplive: fix overflow in BandwidthEstimator" am:
6cc43e10f4
am:
3c0f1962af
Change-Id: Ifab0b1f9ef5cd46b7a6b66c9e2abd27b942875e9
Robert Shih [Thu, 17 Nov 2016 17:54:42 +0000 (17:54 +0000)]
Merge "httplive: fix overflow in BandwidthEstimator"
am:
6cc43e10f4
Change-Id: I62c07442b4bcb05fa067e879c445bf19d4832b13
Robert Shih [Thu, 17 Nov 2016 17:43:36 +0000 (17:43 +0000)]
Merge "httplive: fix overflow in BandwidthEstimator"
Jinguang Dong [Mon, 14 Nov 2016 08:04:02 +0000 (16:04 +0800)]
Camera3: Add missing mTriggerMutex lock
There is thread safety problem for mTriggerMap in
Camera3Device::RequestThread::clear(). For correctness,
acquire mTriggerMutex before mTriggermap.clear().
Test: 1. Configure power saving mode to 2 seconds by
modification software;
2. using pyhon or monkey to turn on the screen every 4
second;
3. device doesn't crash any more on loop test.
Change-Id: I2f04e21dae3a9879d6cebfefb9d9c191ef3f4df4
Yunlian Jiang [Wed, 16 Nov 2016 04:24:56 +0000 (04:24 +0000)]
Merge "fix Access to field 'targets' results in a dereference of a null pointer" am:
caea9fc26a
am:
52caf00e7a
Change-Id: I15f70bc8db093c14a499ef0e53abb4e62a5629ce
Yunlian Jiang [Wed, 16 Nov 2016 04:17:57 +0000 (04:17 +0000)]
Merge "fix Access to field 'targets' results in a dereference of a null pointer"
am:
caea9fc26a
Change-Id: Id38c914a250aab0b4a395739db7e700c821ddaf3
Treehugger Robot [Wed, 16 Nov 2016 04:08:57 +0000 (04:08 +0000)]
Merge "fix Access to field 'targets' results in a dereference of a null pointer"
Andy Hung [Wed, 16 Nov 2016 01:19:58 +0000 (17:19 -0800)]
Effect: Use local cached data for Effect commit
Test: POC, Cts Effect, BassBoost, EnvReverb, Equalizer,
Test: LoudnessEnhancer, PresetReverb, Virtualizer, Visualizer
Bug:
32220769
Change-Id: Iea96ba0daf71691ee8954cca4ba1c10fe827626e
Caroline Tice [Wed, 16 Nov 2016 02:03:48 +0000 (18:03 -0800)]
Fix null-pointer derefernce warning.
Fixes IOMX.cpp:599 warning: Dereference of null pointer
BUG: None
Test: Warning is now gone.
Change-Id: Ife4a8d8af9b2eccd020448ac2ad4c65de081eb4c
Yunlian Jiang [Wed, 16 Nov 2016 01:55:57 +0000 (17:55 -0800)]
fix Potential leak of memory pointed to by 'sourcesLiteral'
Bug: none
Test: the warning is gone.
Change-Id: I8fe9610e24e31e3f788d00fa7f594e1274771433
Yunlian Jiang [Wed, 16 Nov 2016 01:52:15 +0000 (17:52 -0800)]
fix Access to field 'targets' results in a dereference of a null pointer
This fixes Access to field 'targets' results in a dereference of a null
pointer
Test: the warning is gone.
Change-Id: If5d8c1c87c4cf77252bd5d262eefeba30c772fe7
Ricardo Garcia [Wed, 16 Nov 2016 00:54:16 +0000 (00:54 +0000)]
Merge "Fix security vulnerability: Effect command might allow negative indexes" into klp-dev am:
501aee7a54 am:
dd269152c4 am:
756f8dcdc1 am:
8b850ec8d5 am:
b926fff90e am:
ea841facc8 am:
e6dfef5e91 am:
6f853ae378 am:
04fec8bc04 am:
a2b8d9c79b am:
d2185caaf7 am:
1fa7caa69b
am:
bca948ed84
Change-Id: I82d899cf619f10d8d3e099e9e47eb786058ed64a
rago [Wed, 16 Nov 2016 00:53:46 +0000 (00:53 +0000)]
Fix security vulnerability: Effect command might allow negative indexes am:
01183402d7 am:
94e3424b74 am:
9bf3487e7a am:
d4881f8406 am:
f31abe2c96 am:
0905c40edc am:
7b4d79044d am:
a6323b04de am:
d8383694f9 am:
e92a0c60d8 am:
3712921ae9 am:
df9b8955cb
am:
3939df6105
Change-Id: Ie8d3167ba9e72a343ae0682682de5c22a181f2ea
Ricardo Garcia [Wed, 16 Nov 2016 00:47:02 +0000 (00:47 +0000)]
Merge "Fix security vulnerability: Effect command might allow negative indexes" into klp-dev am:
501aee7a54 am:
dd269152c4 am:
756f8dcdc1 am:
8b850ec8d5 am:
b926fff90e am:
ea841facc8 am:
e6dfef5e91 am:
6f853ae378 am:
04fec8bc04 am:
a2b8d9c79b am:
d2185caaf7
am:
1fa7caa69b
Change-Id: I6134dbe0e83ba8cd7a1dffc75e5a0c94be0978a9
rago [Wed, 16 Nov 2016 00:46:42 +0000 (00:46 +0000)]
Fix security vulnerability: Effect command might allow negative indexes am:
01183402d7 am:
94e3424b74 am:
9bf3487e7a am:
d4881f8406 am:
f31abe2c96 am:
0905c40edc am:
7b4d79044d am:
a6323b04de am:
d8383694f9 am:
e92a0c60d8 am:
3712921ae9
am:
df9b8955cb
Change-Id: Ic833b1a33888c11e168ced72fe3fb3a039ada504
Ricardo Garcia [Wed, 16 Nov 2016 00:40:34 +0000 (00:40 +0000)]
Merge "Fix security vulnerability: Effect command might allow negative indexes" into klp-dev am:
501aee7a54 am:
dd269152c4 am:
756f8dcdc1 am:
8b850ec8d5 am:
b926fff90e am:
ea841facc8 am:
e6dfef5e91 am:
6f853ae378 am:
04fec8bc04 am:
a2b8d9c79b
am:
d2185caaf7
Change-Id: Icdfc1087e0fde2f985d1dd82f43697d5dc313c1b
rago [Wed, 16 Nov 2016 00:40:12 +0000 (00:40 +0000)]
Fix security vulnerability: Effect command might allow negative indexes am:
01183402d7 am:
94e3424b74 am:
9bf3487e7a am:
d4881f8406 am:
f31abe2c96 am:
0905c40edc am:
7b4d79044d am:
a6323b04de am:
d8383694f9 am:
e92a0c60d8
am:
3712921ae9
Change-Id: Ied23e1ee06fba975584efe2aa55af1ef8aabc6a8
Ricardo Garcia [Wed, 16 Nov 2016 00:33:02 +0000 (00:33 +0000)]
Merge "Fix security vulnerability: Effect command might allow negative indexes" into klp-dev am:
501aee7a54 am:
dd269152c4 am:
756f8dcdc1 am:
8b850ec8d5 am:
b926fff90e am:
ea841facc8 am:
e6dfef5e91 am:
6f853ae378 am:
04fec8bc04
am:
a2b8d9c79b
Change-Id: I5cd99b8221bcce893d86e571dd6c427c25f1c5fa
rago [Wed, 16 Nov 2016 00:32:42 +0000 (00:32 +0000)]
Fix security vulnerability: Effect command might allow negative indexes am:
01183402d7 am:
94e3424b74 am:
9bf3487e7a am:
d4881f8406 am:
f31abe2c96 am:
0905c40edc am:
7b4d79044d am:
a6323b04de am:
d8383694f9
am:
e92a0c60d8
Change-Id: I0275c7561f4da96d0a17a663d4c2ce8942f33bbb
Ricardo Garcia [Wed, 16 Nov 2016 00:26:09 +0000 (00:26 +0000)]
Merge "Fix security vulnerability: Effect command might allow negative indexes" into klp-dev am:
501aee7a54 am:
dd269152c4 am:
756f8dcdc1 am:
8b850ec8d5 am:
b926fff90e am:
ea841facc8 am:
e6dfef5e91 am:
6f853ae378
am:
04fec8bc04
Change-Id: I4151b6b4a66bf48de4e7dd85ca208b4d823a2c1a
rago [Wed, 16 Nov 2016 00:25:49 +0000 (00:25 +0000)]
Fix security vulnerability: Effect command might allow negative indexes am:
01183402d7 am:
94e3424b74 am:
9bf3487e7a am:
d4881f8406 am:
f31abe2c96 am:
0905c40edc am:
7b4d79044d am:
a6323b04de
am:
d8383694f9
Change-Id: Ic1519b7edc19efa5f85a4ffef543d3988dfc133a
Ricardo Garcia [Wed, 16 Nov 2016 00:18:29 +0000 (00:18 +0000)]
Merge "Fix security vulnerability: Effect command might allow negative indexes" into klp-dev am:
501aee7a54 am:
dd269152c4 am:
756f8dcdc1 am:
8b850ec8d5 am:
b926fff90e am:
ea841facc8 am:
e6dfef5e91
am:
6f853ae378
Change-Id: Idee8cd9b5f0322d2e52bc803f9bf364033fe43e1
rago [Wed, 16 Nov 2016 00:18:10 +0000 (00:18 +0000)]
Fix security vulnerability: Effect command might allow negative indexes am:
01183402d7 am:
94e3424b74 am:
9bf3487e7a am:
d4881f8406 am:
f31abe2c96 am:
0905c40edc am:
7b4d79044d
am:
a6323b04de
Change-Id: I554da95970c72b30ff7223fb82014978462184b5
Ricardo Garcia [Wed, 16 Nov 2016 00:11:30 +0000 (00:11 +0000)]
Merge "Fix security vulnerability: Effect command might allow negative indexes" into klp-dev am:
501aee7a54 am:
dd269152c4 am:
756f8dcdc1 am:
8b850ec8d5 am:
b926fff90e am:
ea841facc8
am:
e6dfef5e91
Change-Id: Id9974657e3da0c5a061135e04f58595b6496360b
OSDN Git Service
