OSDN Git Service

android-x86/frameworks-av.git
7 years agoMerge "Effect: Use local cached data for Effect commit" into klp-dev am: 1576f5968c...
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

7 years agoEffect: Use local cached data for Effect commit am: dd79ccda92 am: 82c8c7656f am...
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

7 years agoMerge "Effect: Use local cached data for Effect commit" into klp-dev am: 1576f5968c...
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

7 years agoEffect: Use local cached data for Effect commit am: dd79ccda92 am: 82c8c7656f am...
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

7 years agoMerge "Effect: Use local cached data for Effect commit" into klp-dev am: 1576f5968c...
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

7 years agoEffect: Use local cached data for Effect commit am: dd79ccda92 am: 82c8c7656f am...
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

7 years agoMerge "Effect: Use local cached data for Effect commit" into klp-dev am: 1576f5968c...
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

7 years agoEffect: Use local cached data for Effect commit am: dd79ccda92 am: 82c8c7656f am...
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

7 years agoMerge "Effect: Use local cached data for Effect commit" into klp-dev am: 1576f5968c...
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

7 years agoEffect: Use local cached data for Effect commit am: dd79ccda92 am: 82c8c7656f am...
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

7 years agoMerge "Effect: Use local cached data for Effect commit" into klp-dev am: 1576f5968c...
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

7 years agoEffect: Use local cached data for Effect commit am: dd79ccda92 am: 82c8c7656f am...
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

7 years agoMerge "Effect: Use local cached data for Effect commit" into klp-dev am: 1576f5968c...
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

7 years agoEffect: Use local cached data for Effect commit am: dd79ccda92 am: 82c8c7656f am...
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

7 years agoMerge "Effect: Use local cached data for Effect commit" into klp-dev am: 1576f5968c...
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

7 years agoEffect: Use local cached data for Effect commit am: dd79ccda92 am: 82c8c7656f am...
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

7 years agoMerge "Effect: Use local cached data for Effect commit" into klp-dev am: 1576f5968c...
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

7 years agoEffect: Use local cached data for Effect commit am: dd79ccda92 am: 82c8c7656f am...
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

7 years agoMerge "Effect: Use local cached data for Effect commit" into klp-dev am: 1576f5968c...
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

7 years agoEffect: Use local cached data for Effect commit am: dd79ccda92 am: 82c8c7656f am...
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

7 years agoMerge "Effect: Use local cached data for Effect commit" into klp-dev am: 1576f5968c...
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

7 years agoEffect: Use local cached data for Effect commit am: dd79ccda92 am: 82c8c7656f
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

7 years agoMerge "Effect: Use local cached data for Effect commit" into klp-dev am: 1576f5968c
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

7 years agoEffect: Use local cached data for Effect commit am: dd79ccda92
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

7 years agoMerge "Effect: Use local cached data for Effect commit" into klp-dev
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

7 years agoEffect: Use local cached data for Effect commit
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

7 years agoMerge "Effect: Use local cached data for Effect commit" into klp-dev
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

7 years agoFix security vulnerability: potential OOB write in audioserver am: e275907e57 am...
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

7 years agoFix security vulnerability: potential OOB write in audioserver am: e275907e57 am...
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

7 years agoFix security vulnerability: potential OOB write in audioserver am: e275907e57 am...
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

7 years agoFix security vulnerability: potential OOB write in audioserver am: e275907e57 am...
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

7 years agoFix security vulnerability: potential OOB write in audioserver am: e275907e57 am...
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

7 years agoFix security vulnerability: potential OOB write in audioserver am: e275907e57 am...
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

7 years agoFix security vulnerability: potential OOB write in audioserver am: e275907e57 am...
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

7 years agoFix security vulnerability: potential OOB write in audioserver am: e275907e57 am...
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

7 years agoFix security vulnerability: potential OOB write in audioserver am: e275907e57 am...
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

7 years agoFix security vulnerability: potential OOB write in audioserver am: e275907e57 am...
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

7 years agoFix security vulnerability: potential OOB write in audioserver am: e275907e57 am...
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

7 years agoFix security vulnerability: potential OOB write in audioserver am: e275907e57
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

7 years agoFix security vulnerability: potential OOB write in audioserver
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

7 years agoFix security vulnerability: potential OOB write in audioserver
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

7 years agoIf a device does not have a camera, do not set a camera death notifier
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

7 years agoEffect: Use local cached data for Effect commit
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

7 years agoMerge "Fix security vulnerability: Effect command might allow negative indexes" into...
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

7 years agoFix security vulnerability: Effect command might allow negative indexes am: 01183402d...
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

7 years agoMerge "Fix security vulnerability: Effect command might allow negative indexes" into...
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

7 years agoFix security vulnerability: Effect command might allow negative indexes am: 01183402d...
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

7 years agoMerge "Fix security vulnerability: Effect command might allow negative indexes" into...
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

7 years agoFix security vulnerability: Effect command might allow negative indexes am: 01183402d...
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

7 years agoMerge "Fix security vulnerability: Effect command might allow negative indexes" into...
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

7 years agoFix security vulnerability: Effect command might allow negative indexes am: 01183402d...
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

7 years agoMerge "Fix security vulnerability: Effect command might allow negative indexes" into...
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

7 years agoFix security vulnerability: Effect command might allow negative indexes am: 01183402d...
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

7 years agoMerge "Fix security vulnerability: Effect command might allow negative indexes" into...
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

7 years agoFix security vulnerability: Effect command might allow negative indexes am: 01183402d...
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

7 years agoMerge "Fix security vulnerability: Effect command might allow negative indexes" into...
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

7 years agoFix security vulnerability: Effect command might allow negative indexes am: 01183402d...
rago [Wed, 16 Nov 2016 00:11:09 +0000 (00:11 +0000)]
Fix security vulnerability: Effect command might allow negative indexes am: 01183402d7 am: 94e3424b74 am: 9bf3487e7a am: d4881f8406 am: f31abe2c96 am: 0905c40edc
am: 7b4d79044d

Change-Id: I03daf2b067e7e6a725e546040bc994ba792a5a5c

7 years agoMerge "Fix security vulnerability: Effect command might allow negative indexes" into...
Ricardo Garcia [Wed, 16 Nov 2016 00:04:03 +0000 (00:04 +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

Change-Id: Id093997f3ff58f89ec5aced7006d34201ae52ecd

7 years agoFix security vulnerability: Effect command might allow negative indexes am: 01183402d...
rago [Wed, 16 Nov 2016 00:03:41 +0000 (00:03 +0000)]
Fix security vulnerability: Effect command might allow negative indexes am: 01183402d7 am: 94e3424b74 am: 9bf3487e7a am: d4881f8406 am: f31abe2c96
am: 0905c40edc

Change-Id: I1e1cddf4f5a95b4ac251aae6ff5db31877517936

7 years agoMerge "Fix security vulnerability: Effect command might allow negative indexes" into...
Ricardo Garcia [Tue, 15 Nov 2016 23:57:29 +0000 (23:57 +0000)]
Merge "Fix security vulnerability: Effect command might allow negative indexes" into klp-dev am: 501aee7a54 am: dd269152c4 am: 756f8dcdc1 am: 8b850ec8d5
am: b926fff90e

Change-Id: I918b03096776bb3881b1b3521e0da9917bbb1111

7 years agoFix security vulnerability: Effect command might allow negative indexes am: 01183402d...
rago [Tue, 15 Nov 2016 23:57:09 +0000 (23:57 +0000)]
Fix security vulnerability: Effect command might allow negative indexes am: 01183402d7 am: 94e3424b74 am: 9bf3487e7a am: d4881f8406
am: f31abe2c96

Change-Id: I7f305a4dacb8dd382a52d6b3f95b41bfbd5151a6

7 years agoMerge "Fix security vulnerability: Effect command might allow negative indexes" into...
Ricardo Garcia [Tue, 15 Nov 2016 23:49:57 +0000 (23:49 +0000)]
Merge "Fix security vulnerability: Effect command might allow negative indexes" into klp-dev am: 501aee7a54 am: dd269152c4 am: 756f8dcdc1
am: 8b850ec8d5

Change-Id: I1cf21ca7d1124a986f390b103f4c641b67e807a9

7 years agoFix security vulnerability: Effect command might allow negative indexes am: 01183402d...
rago [Tue, 15 Nov 2016 23:49:38 +0000 (23:49 +0000)]
Fix security vulnerability: Effect command might allow negative indexes am: 01183402d7 am: 94e3424b74 am: 9bf3487e7a
am: d4881f8406

Change-Id: I4786037f49f5da37a1a363f7cb01c9c086776624

7 years agoMerge "Fix security vulnerability: Effect command might allow negative indexes" into...
Ricardo Garcia [Tue, 15 Nov 2016 23:43:28 +0000 (23:43 +0000)]
Merge "Fix security vulnerability: Effect command might allow negative indexes" into klp-dev am: 501aee7a54 am: dd269152c4
am: 756f8dcdc1

Change-Id: I9ce75a77ed741953c3476576387eebf77e21f784

7 years agoFix security vulnerability: Effect command might allow negative indexes am: 01183402d...
rago [Tue, 15 Nov 2016 23:43:09 +0000 (23:43 +0000)]
Fix security vulnerability: Effect command might allow negative indexes am: 01183402d7 am: 94e3424b74
am: 9bf3487e7a

Change-Id: Ia36571a591829777096ad41316b7edf169ce9a6c

7 years agoMerge "Fix security vulnerability: Effect command might allow negative indexes" into...
Ricardo Garcia [Tue, 15 Nov 2016 23:35:55 +0000 (23:35 +0000)]
Merge "Fix security vulnerability: Effect command might allow negative indexes" into klp-dev am: 501aee7a54
am: dd269152c4

Change-Id: I336c76f311fc09cd81ccd22a35dada99d0b76be7

7 years agoFix security vulnerability: Effect command might allow negative indexes am: 01183402d7
rago [Tue, 15 Nov 2016 23:35:37 +0000 (23:35 +0000)]
Fix security vulnerability: Effect command might allow negative indexes am: 01183402d7
am: 94e3424b74

Change-Id: Id0353ac5716377b45e3a967110d43d9baf744be8

7 years agoMerge "Fix security vulnerability: Effect command might allow negative indexes" into...
Ricardo Garcia [Tue, 15 Nov 2016 23:28:07 +0000 (23:28 +0000)]
Merge "Fix security vulnerability: Effect command might allow negative indexes" into klp-dev
am: 501aee7a54

Change-Id: I7386c90f91d41d2b6df3efc28cfa6e4b4f79608a

7 years agoFix security vulnerability: Effect command might allow negative indexes
rago [Tue, 15 Nov 2016 23:28:06 +0000 (23:28 +0000)]
Fix security vulnerability: Effect command might allow negative indexes
am: 01183402d7

Change-Id: I13603ac1cdb57b844ca7d03f119adda832825f34

7 years agoMerge "Fix security vulnerability: Effect command might allow negative indexes" into...
Ricardo Garcia [Tue, 15 Nov 2016 23:19:20 +0000 (23:19 +0000)]
Merge "Fix security vulnerability: Effect command might allow negative indexes" into klp-dev

7 years agoFix security vulnerability: Effect command might allow negative indexes
rago [Mon, 14 Nov 2016 22:58:34 +0000 (14:58 -0800)]
Fix security vulnerability: Effect command might allow negative indexes

Bug: 32448258
Bug: 32095626

Test: Use POC bug or cts security test
Change-Id: I69f24eac5866f8d9090fc4c0ebe58c2c297b63df

7 years agoMerge "DO NOT MERGE: defensive parsing of mp3 album art information" into lmp-mr1...
Ray Essick [Mon, 14 Nov 2016 22:10:59 +0000 (22:10 +0000)]
Merge "DO NOT MERGE: defensive parsing of mp3 album art information" into lmp-mr1-dev am: 7cfd47c566 am: 929cb0f1b4  -s ours am: 36f3126596 am: d4f39a0a85 am: f06b06a624 am: 8a8dc5464e  -s ours am: 5eaa9d22bc am: 6e7c0efb9e
am: 54c7cd959f

Change-Id: I77e686a08d1a0d0ca883853e34984bfc52b437d4

7 years agoDO NOT MERGE: defensive parsing of mp3 album art information am: 5759c46d84 am: 6e461...
Ray Essick [Mon, 14 Nov 2016 22:10:41 +0000 (22:10 +0000)]
DO NOT MERGE: defensive parsing of mp3 album art information am: 5759c46d84 am: 6e46140a99  -s ours am: adec800cc1 am: 340f678953 am: 32c32abaf2 am: 28e793c11b  -s ours am: 43151ef3a7 am: 5ef3403fdc
am: ee465dd72e

Change-Id: Ic1510d78a75d5931f66ef0cba5c3c0e2472bfdd8

7 years agoMerge "DO NOT MERGE: defensive parsing of mp3 album art information" into lmp-mr1...
Ray Essick [Mon, 14 Nov 2016 22:03:26 +0000 (22:03 +0000)]
Merge "DO NOT MERGE: defensive parsing of mp3 album art information" into lmp-mr1-dev am: 7cfd47c566 am: 929cb0f1b4  -s ours am: 36f3126596 am: d4f39a0a85 am: f06b06a624 am: 8a8dc5464e  -s ours am: 5eaa9d22bc
am: 6e7c0efb9e

Change-Id: I89c14a8b9eeadacbe4ec2b8c36d0f6c04c83e5f2

7 years agoDO NOT MERGE: defensive parsing of mp3 album art information am: 5759c46d84 am: 6e461...
Ray Essick [Mon, 14 Nov 2016 22:03:11 +0000 (22:03 +0000)]
DO NOT MERGE: defensive parsing of mp3 album art information am: 5759c46d84 am: 6e46140a99  -s ours am: adec800cc1 am: 340f678953 am: 32c32abaf2 am: 28e793c11b  -s ours am: 43151ef3a7
am: 5ef3403fdc

Change-Id: I4adae0758a7b8b75f7ee492ca4bee00aed10ad60

7 years agoMerge "DO NOT MERGE: defensive parsing of mp3 album art information" into lmp-mr1...
Ray Essick [Mon, 14 Nov 2016 21:55:58 +0000 (21:55 +0000)]
Merge "DO NOT MERGE: defensive parsing of mp3 album art information" into lmp-mr1-dev am: 7cfd47c566 am: 929cb0f1b4  -s ours am: 36f3126596 am: d4f39a0a85 am: f06b06a624 am: 8a8dc5464e  -s ours
am: 5eaa9d22bc

Change-Id: I82fb1e189b1e4ce50a2cf21dcc6a016a9aead7c6

7 years agoDO NOT MERGE: defensive parsing of mp3 album art information am: 5759c46d84 am: 6e461...
Ray Essick [Mon, 14 Nov 2016 21:55:39 +0000 (21:55 +0000)]
DO NOT MERGE: defensive parsing of mp3 album art information am: 5759c46d84 am: 6e46140a99  -s ours am: adec800cc1 am: 340f678953 am: 32c32abaf2 am: 28e793c11b  -s ours
am: 43151ef3a7

Change-Id: I814093cd6e110f9eda51f3243def7aa93ca363d4

7 years agoMerge "DO NOT MERGE: defensive parsing of mp3 album art information" into lmp-mr1...
Ray Essick [Mon, 14 Nov 2016 21:48:57 +0000 (21:48 +0000)]
Merge "DO NOT MERGE: defensive parsing of mp3 album art information" into lmp-mr1-dev am: 7cfd47c566 am: 929cb0f1b4  -s ours am: 36f3126596 am: d4f39a0a85 am: f06b06a624
am: 8a8dc5464e  -s ours

Change-Id: I703a66740fa0179203aa96c89caafab2b3fecef6

7 years agoDO NOT MERGE: defensive parsing of mp3 album art information am: 5759c46d84 am: 6e461...
Ray Essick [Mon, 14 Nov 2016 21:48:39 +0000 (21:48 +0000)]
DO NOT MERGE: defensive parsing of mp3 album art information am: 5759c46d84 am: 6e46140a99  -s ours am: adec800cc1 am: 340f678953 am: 32c32abaf2
am: 28e793c11b  -s ours

Change-Id: Id2544b96d8a262edcded291a0c6d37a510c6b0fc

7 years agoMerge "DO NOT MERGE: defensive parsing of mp3 album art information" into lmp-mr1...
Ray Essick [Mon, 14 Nov 2016 21:41:57 +0000 (21:41 +0000)]
Merge "DO NOT MERGE: defensive parsing of mp3 album art information" into lmp-mr1-dev am: 7cfd47c566 am: 929cb0f1b4  -s ours am: 36f3126596 am: d4f39a0a85
am: f06b06a624

Change-Id: I6983ff61250391730069f7383ee809e32ea3e639

7 years agoDO NOT MERGE: defensive parsing of mp3 album art information am: 5759c46d84 am: 6e461...
Ray Essick [Mon, 14 Nov 2016 21:41:39 +0000 (21:41 +0000)]
DO NOT MERGE: defensive parsing of mp3 album art information am: 5759c46d84 am: 6e46140a99  -s ours am: adec800cc1 am: 340f678953
am: 32c32abaf2

Change-Id: I21ffabfdd04bdec23859bf3f8ae8f790307d42e3

7 years agoMake VBRISeeker more robust am: 7fdd36418e am: ae0cffaced am: 82642824a5 am: c236ae3a...
Marco Nelissen [Mon, 14 Nov 2016 21:41:11 +0000 (21:41 +0000)]
Make VBRISeeker more robust am: 7fdd36418e am: ae0cffaced am: 82642824a5 am: c236ae3ad0 am: 43dad372e7 am: aa8c778d64 am: a0b2e1682f am: 443a1aa7db am: 1b0f31aa40 am: 0465a2c215 am: 93c02f8427 am: 1d12419f63
am: 8094ae6164

Change-Id: I8b3a12b0046dc94756f2f2dd637bfa1f0342361b

7 years agoMerge "DO NOT MERGE: defensive parsing of mp3 album art information" into lmp-mr1...
Ray Essick [Mon, 14 Nov 2016 21:34:25 +0000 (21:34 +0000)]
Merge "DO NOT MERGE: defensive parsing of mp3 album art information" into lmp-mr1-dev am: 7cfd47c566 am: 929cb0f1b4  -s ours am: 36f3126596
am: d4f39a0a85

Change-Id: I5bc5911572683600fdf8265db14f9677f3519e73

7 years agoMake VBRISeeker more robust am: 7fdd36418e am: ae0cffaced am: 82642824a5 am: c236ae3a...
Marco Nelissen [Mon, 14 Nov 2016 21:34:09 +0000 (21:34 +0000)]
Make VBRISeeker more robust am: 7fdd36418e am: ae0cffaced am: 82642824a5 am: c236ae3ad0 am: 43dad372e7 am: aa8c778d64 am: a0b2e1682f am: 443a1aa7db am: 1b0f31aa40 am: 0465a2c215 am: 93c02f8427
am: 1d12419f63

Change-Id: I69b84acb183515390c0786e7cc53fd53e922e743

7 years agoDO NOT MERGE: defensive parsing of mp3 album art information am: 5759c46d84 am: 6e461...
Ray Essick [Mon, 14 Nov 2016 21:34:08 +0000 (21:34 +0000)]
DO NOT MERGE: defensive parsing of mp3 album art information am: 5759c46d84 am: 6e46140a99  -s ours am: adec800cc1
am: 340f678953

Change-Id: Ie26fa73b8cddde28e276efccb6dff544bd662542

7 years agoMerge "DO NOT MERGE: defensive parsing of mp3 album art information" into lmp-mr1...
Ray Essick [Mon, 14 Nov 2016 21:27:24 +0000 (21:27 +0000)]
Merge "DO NOT MERGE: defensive parsing of mp3 album art information" into lmp-mr1-dev am: 7cfd47c566 am: 929cb0f1b4  -s ours
am: 36f3126596

Change-Id: I4692e709879129aa80766ce093b18f6b6f71c1ec

7 years agoMake VBRISeeker more robust am: 7fdd36418e am: ae0cffaced am: 82642824a5 am: c236ae3a...
Marco Nelissen [Mon, 14 Nov 2016 21:27:07 +0000 (21:27 +0000)]
Make VBRISeeker more robust am: 7fdd36418e am: ae0cffaced am: 82642824a5 am: c236ae3ad0 am: 43dad372e7 am: aa8c778d64 am: a0b2e1682f am: 443a1aa7db am: 1b0f31aa40 am: 0465a2c215
am: 93c02f8427

Change-Id: I41cd3d797f6846fa16f18bdd4fcfa2903612309a

7 years agoDO NOT MERGE: defensive parsing of mp3 album art information am: 5759c46d84 am: 6e461...
Ray Essick [Mon, 14 Nov 2016 21:27:07 +0000 (21:27 +0000)]
DO NOT MERGE: defensive parsing of mp3 album art information am: 5759c46d84 am: 6e46140a99  -s ours
am: adec800cc1

Change-Id: I15f4f8a0864d8c6cdbc8ee67ef191e37452261ae

7 years agoMerge "DO NOT MERGE: defensive parsing of mp3 album art information" into lmp-mr1...
Ray Essick [Mon, 14 Nov 2016 21:20:53 +0000 (21:20 +0000)]
Merge "DO NOT MERGE: defensive parsing of mp3 album art information" into lmp-mr1-dev am: 7cfd47c566
am: 929cb0f1b4  -s ours

Change-Id: Ic0f6897b160d0c52fa9bb9c0d980a44b925e1b13

7 years agoMake VBRISeeker more robust am: 7fdd36418e am: ae0cffaced am: 82642824a5 am: c236ae3a...
Marco Nelissen [Mon, 14 Nov 2016 21:20:39 +0000 (21:20 +0000)]
Make VBRISeeker more robust am: 7fdd36418e am: ae0cffaced am: 82642824a5 am: c236ae3ad0 am: 43dad372e7 am: aa8c778d64 am: a0b2e1682f am: 443a1aa7db am: 1b0f31aa40
am: 0465a2c215

Change-Id: I09efff0a3691cf5daf25e3e346e357f3c8a543b3

7 years agoDO NOT MERGE: defensive parsing of mp3 album art information am: 5759c46d84
Ray Essick [Mon, 14 Nov 2016 21:20:37 +0000 (21:20 +0000)]
DO NOT MERGE: defensive parsing of mp3 album art information am: 5759c46d84
am: 6e46140a99  -s ours

Change-Id: I39b8aed58300843811423c0539a3caef998744e8

7 years agoMerge "DO NOT MERGE: defensive parsing of mp3 album art information" into lmp-mr1-dev
Ray Essick [Mon, 14 Nov 2016 21:13:37 +0000 (21:13 +0000)]
Merge "DO NOT MERGE: defensive parsing of mp3 album art information" into lmp-mr1-dev
am: 7cfd47c566

Change-Id: I6850faa8b803654a47fd7c4f9e661e16cf272ec6

7 years agoMake VBRISeeker more robust am: 7fdd36418e am: ae0cffaced am: 82642824a5 am: c236ae3a...
Marco Nelissen [Mon, 14 Nov 2016 21:13:37 +0000 (21:13 +0000)]
Make VBRISeeker more robust am: 7fdd36418e am: ae0cffaced am: 82642824a5 am: c236ae3ad0 am: 43dad372e7 am: aa8c778d64 am: a0b2e1682f am: 443a1aa7db
am: 1b0f31aa40

Change-Id: Ia7a38aa375fd269177da02f557337bf18ee7cf25

7 years agoDO NOT MERGE: defensive parsing of mp3 album art information
Ray Essick [Mon, 14 Nov 2016 21:13:36 +0000 (21:13 +0000)]
DO NOT MERGE: defensive parsing of mp3 album art information
am: 5759c46d84

Change-Id: Ic50efe3ee2fc52ae3cf227d893723f1d9095dac5

7 years agoMake VBRISeeker more robust am: 7fdd36418e am: ae0cffaced am: 82642824a5 am: c236ae3a...
Marco Nelissen [Mon, 14 Nov 2016 21:05:37 +0000 (21:05 +0000)]
Make VBRISeeker more robust am: 7fdd36418e am: ae0cffaced am: 82642824a5 am: c236ae3ad0 am: 43dad372e7 am: aa8c778d64 am: a0b2e1682f
am: 443a1aa7db

Change-Id: I96ec7f79d6d1bec36874962386507719529b3965

7 years agoMake VBRISeeker more robust am: 7fdd36418e am: ae0cffaced am: 82642824a5 am: c236ae3a...
Marco Nelissen [Mon, 14 Nov 2016 20:58:06 +0000 (20:58 +0000)]
Make VBRISeeker more robust am: 7fdd36418e am: ae0cffaced am: 82642824a5 am: c236ae3ad0 am: 43dad372e7 am: aa8c778d64
am: a0b2e1682f

Change-Id: I75153c516c617ac0f11913c5a0f9630daa56f09b

7 years agoMerge "DO NOT MERGE: defensive parsing of mp3 album art information" into lmp-mr1-dev
Ray Essick [Mon, 14 Nov 2016 20:56:52 +0000 (20:56 +0000)]
Merge "DO NOT MERGE: defensive parsing of mp3 album art information" into lmp-mr1-dev

7 years agoMake VBRISeeker more robust am: 7fdd36418e am: ae0cffaced am: 82642824a5 am: c236ae3a...
Marco Nelissen [Mon, 14 Nov 2016 20:50:07 +0000 (20:50 +0000)]
Make VBRISeeker more robust am: 7fdd36418e am: ae0cffaced am: 82642824a5 am: c236ae3ad0 am: 43dad372e7
am: aa8c778d64

Change-Id: Ic3efb4b7b20baf0c992e4e4a76e5cc74f25d00b3

7 years agoMake VBRISeeker more robust am: 7fdd36418e am: ae0cffaced am: 82642824a5 am: c236ae3ad0
Marco Nelissen [Mon, 14 Nov 2016 20:42:35 +0000 (20:42 +0000)]
Make VBRISeeker more robust am: 7fdd36418e am: ae0cffaced am: 82642824a5 am: c236ae3ad0
am: 43dad372e7

Change-Id: Id0b9601ce428f2e30785c9bebabf14377bc89cd7

7 years agoMake VBRISeeker more robust am: 7fdd36418e am: ae0cffaced am: 82642824a5
Marco Nelissen [Mon, 14 Nov 2016 20:35:04 +0000 (20:35 +0000)]
Make VBRISeeker more robust am: 7fdd36418e am: ae0cffaced am: 82642824a5
am: c236ae3ad0

Change-Id: If2f8a18bd63204d336f5de1862f8226b3c74a407