OSDN Git Service

android-x86/frameworks-av.git
7 years agoFix potential overflow in Visualizer effect am: 46dc714d52 am: 8720f85196 am: bad0250dcb
rago [Tue, 20 Sep 2016 00:56:50 +0000 (00:56 +0000)]
Fix potential overflow in Visualizer effect am: 46dc714d52 am: 8720f85196 am: bad0250dcb
am: 2feb9ce748

Change-Id: I6a251c81d4337113a863a5364c39006678cca066

7 years agoIOMX: do not clear buffer if it's allocated by component am: ea76573aa2 am: 86d9bb914...
Chong Zhang [Tue, 20 Sep 2016 00:56:26 +0000 (00:56 +0000)]
IOMX: do not clear buffer if it's allocated by component am: ea76573aa2 am: 86d9bb9141 am: dfe5b5193c
am: b308b1a5d9

Change-Id: I502080e16a7543aac4b6720283f27b365bac8d52

7 years agoFix potential overflow in Visualizer effect am: 46dc714d52 am: 8720f85196
rago [Tue, 20 Sep 2016 00:46:03 +0000 (00:46 +0000)]
Fix potential overflow in Visualizer effect am: 46dc714d52 am: 8720f85196
am: bad0250dcb

Change-Id: I23660e1da14f232ff786f9ab78da3e26f301c1b2

7 years agoIOMX: do not clear buffer if it's allocated by component am: ea76573aa2 am: 86d9bb9141
Chong Zhang [Tue, 20 Sep 2016 00:45:37 +0000 (00:45 +0000)]
IOMX: do not clear buffer if it's allocated by component am: ea76573aa2 am: 86d9bb9141
am: dfe5b5193c

Change-Id: Ibd28b74deb652eb61b08e933a5e288d145841a14

7 years agoFix potential overflow in Visualizer effect am: 46dc714d52
rago [Tue, 20 Sep 2016 00:39:33 +0000 (00:39 +0000)]
Fix potential overflow in Visualizer effect am: 46dc714d52
am: 8720f85196

Change-Id: I0803632824e6fc5a70ad6a1ba36743eb11cc3e7e

7 years agoIOMX: do not clear buffer if it's allocated by component am: ea76573aa2
Chong Zhang [Tue, 20 Sep 2016 00:39:03 +0000 (00:39 +0000)]
IOMX: do not clear buffer if it's allocated by component am: ea76573aa2
am: 86d9bb9141

Change-Id: Id27e600a2c500634cd56bb8367f8d7ce811d63e8

7 years agoFix potential overflow in Visualizer effect
rago [Tue, 20 Sep 2016 00:35:04 +0000 (00:35 +0000)]
Fix potential overflow in Visualizer effect
am: 46dc714d52

Change-Id: I61f5adb793d2c54c078211213b25fd7ea37a3895

7 years agoIOMX: do not clear buffer if it's allocated by component
Chong Zhang [Tue, 20 Sep 2016 00:29:11 +0000 (00:29 +0000)]
IOMX: do not clear buffer if it's allocated by component
am: ea76573aa2

Change-Id: Id77521c1d8a2e3c0f24b3467db0cea1907d5b934

7 years agoIOMX: do not clear buffer if it's allocated by component
Chong Zhang [Mon, 19 Sep 2016 22:29:04 +0000 (15:29 -0700)]
IOMX: do not clear buffer if it's allocated by component

The component might depends on their buffers to be initialized
in certain ways to work. Don't clear unless we're allocating it.

bug: 31586647
Change-Id: Ia0a125797e414998ef0cd8ce03672f5b1e0bbf7a

7 years agoIOMX: allow configuration after going to loaded state am: c13904014b am: 99accf6cdc...
Lajos Molnar [Thu, 15 Sep 2016 22:44:54 +0000 (22:44 +0000)]
IOMX: allow configuration after going to loaded state am: c13904014b am: 99accf6cdc am: 9a565c52b0
am: daa3b8e3fa

Change-Id: I163ffc7bb0b794af540653614be05abfe2fb828e

7 years agoIOMX: allow configuration after going to loaded state am: c13904014b am: 99accf6cdc
Lajos Molnar [Thu, 15 Sep 2016 22:41:53 +0000 (22:41 +0000)]
IOMX: allow configuration after going to loaded state am: c13904014b am: 99accf6cdc
am: 9a565c52b0

Change-Id: If2465b5f16cc58d5d0d7cda3e117ad863dafd479

7 years agoIOMX: allow configuration after going to loaded state am: c13904014b
Lajos Molnar [Thu, 15 Sep 2016 22:39:55 +0000 (22:39 +0000)]
IOMX: allow configuration after going to loaded state am: c13904014b
am: 99accf6cdc

Change-Id: I2f80600bad65948b26e839d8588b98a574ffba9b

7 years agoIOMX: allow configuration after going to loaded state
Lajos Molnar [Thu, 15 Sep 2016 22:36:52 +0000 (22:36 +0000)]
IOMX: allow configuration after going to loaded state
am: c13904014b

Change-Id: Ibc6e43830d08890077691ebd55b1515554b94053

7 years agoIOMX: allow configuration after going to loaded state
Lajos Molnar [Wed, 14 Sep 2016 17:01:37 +0000 (10:01 -0700)]
IOMX: allow configuration after going to loaded state

This was disallowed recently but we still use it as MediaCodcec.stop
only goes to loaded state, and does not free component.

Bug: 31450460
Change-Id: I72e092e4e55c9f23b1baee3e950d76e84a5ef28d

7 years agoMerge "SoundTrigger: get service by value." into lmp-dev
Eric Laurent [Tue, 13 Sep 2016 23:13:41 +0000 (23:13 +0000)]
Merge "SoundTrigger: get service by value." into lmp-dev
am: d9288b85b3

Change-Id: Ic8cd8682688c8363420e768996c13af072f61182

7 years agoSoundTrigger: get service by value.
Eric Laurent [Tue, 13 Sep 2016 23:13:40 +0000 (23:13 +0000)]
SoundTrigger: get service by value.
am: 3b01b3019b

Change-Id: Ibb98c945e51fef6d21e91b1e9f670eb4f83c5663

7 years agoMerge "SoundTrigger: get service by value." into lmp-dev
Eric Laurent [Tue, 13 Sep 2016 23:04:34 +0000 (23:04 +0000)]
Merge "SoundTrigger: get service by value." into lmp-dev

7 years agoMerge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into klp-dev am...
Lajos Molnar [Fri, 9 Sep 2016 17:05:18 +0000 (17:05 +0000)]
Merge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into klp-dev am: 425cc025a1 am: 9c7f0824be am: 56100a30ba  -s ours
am: 563b100957  -s ours

Change-Id: I00e5d507d17dbd98d04809e08d29f8b635a1642f

7 years agoDO NOT MERGE: IOMX: work against metadata buffer spoofing am: 807e827d4c am: ee9effab...
Lajos Molnar [Fri, 9 Sep 2016 17:05:17 +0000 (17:05 +0000)]
DO NOT MERGE: IOMX: work against metadata buffer spoofing am: 807e827d4c am: ee9effab3d am: c5251a627c  -s ours
am: 18f84821f6  -s ours

Change-Id: I6de1712821d83e87de98d3f7a16d1b73d658cf22

7 years agoMerge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into klp-dev am...
Lajos Molnar [Fri, 9 Sep 2016 17:02:17 +0000 (17:02 +0000)]
Merge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into klp-dev am: 425cc025a1 am: 9c7f0824be
am: 56100a30ba  -s ours

Change-Id: Ia6831ce8b12461719321b444bd4475eb3eb6fa1c

7 years agoDO NOT MERGE: IOMX: work against metadata buffer spoofing am: 807e827d4c am: ee9effab3d
Lajos Molnar [Fri, 9 Sep 2016 17:02:16 +0000 (17:02 +0000)]
DO NOT MERGE: IOMX: work against metadata buffer spoofing am: 807e827d4c am: ee9effab3d
am: c5251a627c  -s ours

Change-Id: I356ac50c59cdfa23a67b6e2d7d508c0e02a28901

7 years agoMerge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into klp-dev am...
Lajos Molnar [Fri, 9 Sep 2016 17:00:31 +0000 (17:00 +0000)]
Merge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into klp-dev am: 425cc025a1
am: 9c7f0824be

Change-Id: Ibd31110a7191c39b09947f5026c2c50af3e0146c

7 years agoDO NOT MERGE: IOMX: work against metadata buffer spoofing am: 807e827d4c
Lajos Molnar [Fri, 9 Sep 2016 16:59:46 +0000 (16:59 +0000)]
DO NOT MERGE: IOMX: work against metadata buffer spoofing am: 807e827d4c
am: ee9effab3d

Change-Id: I64bd10fa5e5e5a020c129c0b77d813a2772376a0

7 years agoMerge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into klp-dev
Lajos Molnar [Fri, 9 Sep 2016 16:56:46 +0000 (16:56 +0000)]
Merge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into klp-dev
am: 425cc025a1

Change-Id: I271b7657d85973bf745d3d099d36fc6858442f88

7 years agoMerge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into lmp-dev
Lajos Molnar [Fri, 9 Sep 2016 16:56:46 +0000 (16:56 +0000)]
Merge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into lmp-dev
am: 6981afc6ac  -s ours

Change-Id: I1987358c9b524bc1bd3863f0653947ba7d09407e

7 years agoDO NOT MERGE: IOMX: work against metadata buffer spoofing
Lajos Molnar [Fri, 9 Sep 2016 16:56:46 +0000 (16:56 +0000)]
DO NOT MERGE: IOMX: work against metadata buffer spoofing
am: 86369364a0  -s ours

Change-Id: Ic53907aae24e4238e64a269cd957a0947cc18491

7 years agoDO NOT MERGE: IOMX: work against metadata buffer spoofing
Lajos Molnar [Fri, 9 Sep 2016 16:56:45 +0000 (16:56 +0000)]
DO NOT MERGE: IOMX: work against metadata buffer spoofing
am: 807e827d4c

Change-Id: I514b6b8fce06d666799fcd5f41238e81598c0aa9

7 years agoMerge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into klp-dev
Lajos Molnar [Fri, 9 Sep 2016 16:52:06 +0000 (16:52 +0000)]
Merge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into klp-dev

7 years agoMerge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into lmp-dev
Lajos Molnar [Fri, 9 Sep 2016 16:51:52 +0000 (16:51 +0000)]
Merge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into lmp-dev

7 years agoMerge changes I801c77b8,I3d5bad4a into lmp-mr1-dev
Lajos Molnar [Fri, 9 Sep 2016 16:51:06 +0000 (16:51 +0000)]
Merge changes I801c77b8,I3d5bad4a into lmp-mr1-dev

* changes:
  DO NOT MERGE: IOMX: work against metadata buffer spoofing
  DO NOT MERGE omx: check buffer port before using

7 years agoSoundTrigger: get service by value.
Eric Laurent [Wed, 7 Sep 2016 23:58:39 +0000 (16:58 -0700)]
SoundTrigger: get service by value.

Get strong pointer to service interface by value and not reference to
prevent race conditions where the service pointer can be cleared
by another thread while in use.

Bug: 30907212
Change-Id: I6f02ec3fd1e6392b842b334e1cc4f9aa23916009

7 years agoMediaPlayerService: allow next player to be NULL am: 2828412787 am: f4e00a7c5a am...
Wei Jia [Wed, 31 Aug 2016 00:10:56 +0000 (00:10 +0000)]
MediaPlayerService: allow next player to be NULL am: 2828412787 am: f4e00a7c5a am: 0dd714e408
am: de97dbd662

Change-Id: I758cf33ec36858a612efe6c412af3df9653f9229

7 years agoMediaPlayerService: allow next player to be NULL am: 2828412787 am: f4e00a7c5a
Wei Jia [Wed, 31 Aug 2016 00:08:25 +0000 (00:08 +0000)]
MediaPlayerService: allow next player to be NULL am: 2828412787 am: f4e00a7c5a
am: 0dd714e408

Change-Id: Ib620e8573ff6da861c101311143d266fd5086d7b

7 years agoMediaPlayerService: allow next player to be NULL am: 2828412787
Wei Jia [Wed, 31 Aug 2016 00:05:25 +0000 (00:05 +0000)]
MediaPlayerService: allow next player to be NULL am: 2828412787
am: f4e00a7c5a

Change-Id: I4b72afd20bbca69423d1be6ebf963ed41ded1a4e

7 years agoMediaPlayerService: allow next player to be NULL
Wei Jia [Wed, 31 Aug 2016 00:02:55 +0000 (00:02 +0000)]
MediaPlayerService: allow next player to be NULL
am: 2828412787

Change-Id: I54fad659721dde258259a503c5514d6327e521f7

7 years agoMediaPlayerService: allow next player to be NULL
Wei Jia [Tue, 30 Aug 2016 20:49:06 +0000 (13:49 -0700)]
MediaPlayerService: allow next player to be NULL

Bug: 31155917
Bug: 30204103
Change-Id: I9a2a59ddb900fc942e7c19b31b53a110d790474c

8 years agoFix potential overflow in Visualizer effect
rago [Tue, 23 Aug 2016 00:20:26 +0000 (17:20 -0700)]
Fix potential overflow in Visualizer effect

Bug: 30229821
Change-Id: Idd3c1563dc9d3261e6e168e945005bf133ab2cdb
(cherry picked from commit 099ab280775946e7c36c73fde47f2ee5a2579f53)

8 years agoMerge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev am...
Robert Shih [Mon, 22 Aug 2016 18:32:20 +0000 (18:32 +0000)]
Merge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev am: 4fb531e262 am: 24b2dba452 am: 7fa7052231  -s ours
am: 91ec9a6fd3  -s ours

Change-Id: I075a2bf350184ade7a96cb1e4846d9459695a630

8 years agoDO NOT MERGE MediaPlayerService: avoid invalid static cast am: c159a5ae12 am: 2cee1de...
Robert Shih [Mon, 22 Aug 2016 18:32:19 +0000 (18:32 +0000)]
DO NOT MERGE MediaPlayerService: avoid invalid static cast am: c159a5ae12 am: 2cee1deec9 am: 48b3aca54b  -s ours
am: 08eab78209  -s ours

Change-Id: I82a67d2a77c6cfa2e903e3ff8080ba4ed734f248

8 years agoMerge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev am...
Robert Shih [Mon, 22 Aug 2016 18:28:19 +0000 (18:28 +0000)]
Merge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev am: 4fb531e262 am: 24b2dba452
am: 7fa7052231  -s ours

Change-Id: I5dddb4aeffa111dfda64e335d7baf7758a1740ee

8 years agoDO NOT MERGE MediaPlayerService: avoid invalid static cast am: c159a5ae12 am: 2cee1deec9
Robert Shih [Mon, 22 Aug 2016 18:28:19 +0000 (18:28 +0000)]
DO NOT MERGE MediaPlayerService: avoid invalid static cast am: c159a5ae12 am: 2cee1deec9
am: 48b3aca54b  -s ours

Change-Id: I1f9d2549a454da70e62cf2cc997c045965ecea9a

8 years agoMerge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev am...
Robert Shih [Mon, 22 Aug 2016 18:23:42 +0000 (18:23 +0000)]
Merge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev am: 4fb531e262
am: 24b2dba452

Change-Id: Ia3933416f651d737beaae34cab4efd35e9e6156d

8 years agoDO NOT MERGE MediaPlayerService: avoid invalid static cast am: c159a5ae12
Robert Shih [Mon, 22 Aug 2016 18:23:40 +0000 (18:23 +0000)]
DO NOT MERGE MediaPlayerService: avoid invalid static cast am: c159a5ae12
am: 2cee1deec9

Change-Id: I0cde33c6f069de9eac4e954e9c6ed6f6968546be

8 years agoMerge "MediaPlayerService: avoid invalid static cast" into lmp-dev
Robert Shih [Mon, 22 Aug 2016 18:12:49 +0000 (18:12 +0000)]
Merge "MediaPlayerService: avoid invalid static cast" into lmp-dev
am: e35213de2d

Change-Id: I8d1446a8927952b6e8a561089764f6b662a2f0e4

8 years agoMerge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev
Robert Shih [Mon, 22 Aug 2016 18:12:48 +0000 (18:12 +0000)]
Merge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev
am: 4fb531e262

Change-Id: I3cb099c3fdf0c476a92392b185d782e980a463de

8 years agoDO NOT MERGE MediaPlayerService: avoid invalid static cast
Robert Shih [Mon, 22 Aug 2016 18:12:48 +0000 (18:12 +0000)]
DO NOT MERGE MediaPlayerService: avoid invalid static cast
am: c159a5ae12

Change-Id: I3e349cb44073359b9c009100c341864468187f68

8 years agoMediaPlayerService: avoid invalid static cast
Robert Shih [Mon, 22 Aug 2016 18:12:48 +0000 (18:12 +0000)]
MediaPlayerService: avoid invalid static cast
am: ee0a0e39ac

Change-Id: I2e857a57fe87c5050b1042d27c8e3034df2a462c

8 years agoMerge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev
Robert Shih [Mon, 22 Aug 2016 17:53:09 +0000 (17:53 +0000)]
Merge "DO NOT MERGE MediaPlayerService: avoid invalid static cast" into klp-dev

8 years agoMerge "MediaPlayerService: avoid invalid static cast" into lmp-dev
Robert Shih [Mon, 22 Aug 2016 17:53:05 +0000 (17:53 +0000)]
Merge "MediaPlayerService: avoid invalid static cast" into lmp-dev

8 years agoMerge "soundtrigger: add size check on sound model and recogntion data" into lmp-dev
Andy Hung [Fri, 19 Aug 2016 21:33:26 +0000 (21:33 +0000)]
Merge "soundtrigger: add size check on sound model and recogntion data" into lmp-dev
am: 36e11a4c23

Change-Id: I64b8c4cc80e895dbe62b2f5ce91e6a3764a913da

8 years agosoundtrigger: add size check on sound model and recogntion data
Eric Laurent [Fri, 19 Aug 2016 21:33:25 +0000 (21:33 +0000)]
soundtrigger: add size check on sound model and recogntion data
am: ef0c915184

Change-Id: I5453811eb579dddd599be15108bb114095e07a58

8 years agoMerge "soundtrigger: add size check on sound model and recogntion data" into lmp-dev
Andy Hung [Fri, 19 Aug 2016 21:27:39 +0000 (21:27 +0000)]
Merge "soundtrigger: add size check on sound model and recogntion data" into lmp-dev

8 years agoMerge "Add EFFECT_CMD_SET_PARAM parameter checking" into klp-dev am: 9665548a42 am...
Andy Hung [Fri, 19 Aug 2016 19:07:46 +0000 (19:07 +0000)]
Merge "Add EFFECT_CMD_SET_PARAM parameter checking" into klp-dev am: 9665548a42 am: 19294437ac am: 53657baf41
am: 6cc3c2dc98

Change-Id: I673b3942f3f5005de91e768676df30271d49dfee

8 years agoAdd EFFECT_CMD_SET_PARAM parameter checking am: e4a1d91501 am: 19d8a61324 am: ebd9f1029e
Andy Hung [Fri, 19 Aug 2016 19:07:45 +0000 (19:07 +0000)]
Add EFFECT_CMD_SET_PARAM parameter checking am: e4a1d91501 am: 19d8a61324 am: ebd9f1029e
am: d37cf46848

Change-Id: Ibe08f642742e6db44b16d9827dceeb984e6419f3

8 years agoMerge "Add EFFECT_CMD_SET_PARAM parameter checking" into klp-dev am: 9665548a42 am...
Andy Hung [Fri, 19 Aug 2016 19:04:15 +0000 (19:04 +0000)]
Merge "Add EFFECT_CMD_SET_PARAM parameter checking" into klp-dev am: 9665548a42 am: 19294437ac
am: 53657baf41

Change-Id: I8576f997100e7cc55eb7d96a2af01eb88b4b1ba5

8 years agoAdd EFFECT_CMD_SET_PARAM parameter checking am: e4a1d91501 am: 19d8a61324
Andy Hung [Fri, 19 Aug 2016 19:04:15 +0000 (19:04 +0000)]
Add EFFECT_CMD_SET_PARAM parameter checking am: e4a1d91501 am: 19d8a61324
am: ebd9f1029e

Change-Id: Ic2fa5bba22d9ffc7b69ea97e2e4bc44d8a0fa42d

8 years agoMerge "Add EFFECT_CMD_SET_PARAM parameter checking" into klp-dev am: 9665548a42
Andy Hung [Fri, 19 Aug 2016 18:59:07 +0000 (18:59 +0000)]
Merge "Add EFFECT_CMD_SET_PARAM parameter checking" into klp-dev am: 9665548a42
am: 19294437ac

Change-Id: I926b0e3df89ff3c648c7b6896c359808300896b6

8 years agoAdd EFFECT_CMD_SET_PARAM parameter checking am: e4a1d91501
Andy Hung [Fri, 19 Aug 2016 18:59:06 +0000 (18:59 +0000)]
Add EFFECT_CMD_SET_PARAM parameter checking am: e4a1d91501
am: 19d8a61324

Change-Id: I002990dc446d8a713f41b77671d17dbb11a914f9

8 years agoMerge "Add EFFECT_CMD_SET_PARAM parameter checking" into klp-dev
Andy Hung [Fri, 19 Aug 2016 18:54:13 +0000 (18:54 +0000)]
Merge "Add EFFECT_CMD_SET_PARAM parameter checking" into klp-dev
am: 9665548a42

Change-Id: I784a0df389663da64dfa9a3eadb8b4dd6af545c7

8 years agoAdd EFFECT_CMD_SET_PARAM parameter checking
Andy Hung [Fri, 19 Aug 2016 18:54:12 +0000 (18:54 +0000)]
Add EFFECT_CMD_SET_PARAM parameter checking
am: e4a1d91501

Change-Id: I0b45b8c0fdccc9016717ce21de6771e9e6b6f11f

8 years agoMerge "Add EFFECT_CMD_SET_PARAM parameter checking" into klp-dev
Andy Hung [Fri, 19 Aug 2016 18:49:14 +0000 (18:49 +0000)]
Merge "Add EFFECT_CMD_SET_PARAM parameter checking" into klp-dev

8 years agoDO NOT MERGE - Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636e...
Pawin Vongmasa [Fri, 19 Aug 2016 17:07:04 +0000 (17:07 +0000)]
DO NOT MERGE - Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d. am: ad929db743 am: 453ba68c65 am: 2a21f09fff  -s ours
am: 83cf293b73  -s ours

Change-Id: I92bb3e0101da80205105f1d047eea56f5c5d85a0

8 years agoDO NOT MERGE - Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636e...
Pawin Vongmasa [Fri, 19 Aug 2016 17:04:02 +0000 (17:04 +0000)]
DO NOT MERGE - Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d. am: ad929db743 am: 453ba68c65
am: 2a21f09fff  -s ours

Change-Id: I540ae20fea8366c44796e104662b505192926270

8 years agoMerge "Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d...
Pawin Vongmasa [Fri, 19 Aug 2016 16:57:05 +0000 (16:57 +0000)]
Merge "Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d." into lmp-dev
am: 7a66bd2404

Change-Id: Ia6fabe0d3bcedf9834f3a7dfb8b2a6c19e4f0d80

8 years agoFix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d.
Pawin Vongmasa [Fri, 19 Aug 2016 16:57:04 +0000 (16:57 +0000)]
Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d.
am: baa9146401

Change-Id: I3c8f4edbc3b75f50bc6393271314a71f681ac43d

8 years agoDO NOT MERGE - Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636e...
Pawin Vongmasa [Fri, 19 Aug 2016 16:57:03 +0000 (16:57 +0000)]
DO NOT MERGE - Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d. am: ad929db743
am: 453ba68c65

Change-Id: I833cb55b51e554e6b2ef3227f2923def6643c9e4

8 years agoDO NOT MERGE - Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636e...
Pawin Vongmasa [Fri, 19 Aug 2016 16:54:03 +0000 (16:54 +0000)]
DO NOT MERGE - Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d.
am: ad929db743

Change-Id: Ib2ef17356334d2340a5aa0250a4b5ffbdd9c4dd0

8 years agoMerge "Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d...
Pawin Vongmasa [Fri, 19 Aug 2016 16:53:17 +0000 (16:53 +0000)]
Merge "Fix build breakage caused by commit 940829f69b52d6038db66a9c727534636ecc456d." into lmp-dev

8 years agoMerge "better validation lengths of strings in ID3 tags" into lmp-dev
Ray Essick [Fri, 19 Aug 2016 16:37:31 +0000 (16:37 +0000)]
Merge "better validation lengths of strings in ID3 tags" into lmp-dev
am: ae12b68ba2

Change-Id: I839c9ba9a8d2b5e366745ea137ba4f35979e2494

8 years agobetter validation lengths of strings in ID3 tags
Ray Essick [Fri, 19 Aug 2016 16:37:31 +0000 (16:37 +0000)]
better validation lengths of strings in ID3 tags
am: d23c01546c

Change-Id: Idb8da8a0557349964f862ec1ab9f81542b81c492

8 years agoMerge "better validation lengths of strings in ID3 tags" into lmp-dev
Ray Essick [Fri, 19 Aug 2016 16:33:48 +0000 (16:33 +0000)]
Merge "better validation lengths of strings in ID3 tags" into lmp-dev

8 years agoDO NOT MERGE - Fix build breakage caused by commit
Pawin Vongmasa [Fri, 19 Aug 2016 08:45:39 +0000 (01:45 -0700)]
DO NOT MERGE - Fix build breakage caused by commit
940829f69b52d6038db66a9c727534636ecc456d.

Change-Id: Ic55a9ab25ddb57f270c21d78ffcb556f3e11dd5d

8 years agoFix build breakage caused by commit
Pawin Vongmasa [Fri, 19 Aug 2016 09:07:33 +0000 (02:07 -0700)]
Fix build breakage caused by commit
940829f69b52d6038db66a9c727534636ecc456d.

Change-Id: I4776db4a26fb3c31bb994d48788373fe569c812a

8 years agoDO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame...
Pawin Vongmasa [Fri, 19 Aug 2016 02:53:08 +0000 (02:53 +0000)]
DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame. am: 940829f69b am: 920b0f7887 am: b71a431eab  -s ours
am: 5c4e9db2bb  -s ours

Change-Id: Id306e53c54feb78be4eeedd11fc43796973d8848

8 years agoDO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame...
Pawin Vongmasa [Fri, 19 Aug 2016 02:50:08 +0000 (02:50 +0000)]
DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame. am: 940829f69b am: 920b0f7887
am: b71a431eab  -s ours

Change-Id: I2b59b1bf145b023796e66cc13e385d5ec1c80b54

8 years agoDO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame.
Pawin Vongmasa [Fri, 19 Aug 2016 02:44:07 +0000 (02:44 +0000)]
DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame.
am: 180185da19  -s ours

Change-Id: I73131f2361fa0f950aca6ed77551cb8d7e6a96d9

8 years agoDO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame...
Pawin Vongmasa [Fri, 19 Aug 2016 02:43:37 +0000 (02:43 +0000)]
DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame. am: 940829f69b
am: 920b0f7887

Change-Id: I603ab931f82d8a83187be989dccb8686de8bf95e

8 years agoDO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame.
Pawin Vongmasa [Fri, 19 Aug 2016 02:40:37 +0000 (02:40 +0000)]
DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame.
am: 940829f69b

Change-Id: I3df8797998bac785ad198cb4fb2401779a3947ff

8 years agoAdd EFFECT_CMD_SET_PARAM parameter checking
Andy Hung [Wed, 17 Aug 2016 21:11:13 +0000 (14:11 -0700)]
Add EFFECT_CMD_SET_PARAM parameter checking

Bug: 30204301
Change-Id: Ib9c3ee1c2f23c96f8f7092dd9e146bc453d7a290

8 years agoDO NOT MERGE: IOMX: work against metadata buffer spoofing
Lajos Molnar [Tue, 2 Aug 2016 14:07:05 +0000 (07:07 -0700)]
DO NOT MERGE: IOMX: work against metadata buffer spoofing

- Prohibit direct set/getParam/Settings for extensions meant for
  OMXNodeInstance alone. This disallows enabling metadata mode
  without the knowledge of OMXNodeInstance.
- Do not share metadata mode buffers cross process.
- Disallow setting up metadata mode/tunneling/input surface
  after first sendCommand. (Except to Idle for OMXCodec quirk.)
- Disallow store-meta for input cross process.
- Disallow emptyBuffer for surface input (via IOMX).
- Fix checking for input surface.

[backported from M]

Bug: 29422020
Change-Id: I801c77b80e703903f62e42d76fd2e76a34e4bc8e

8 years agoDO NOT MERGE: IOMX: work against metadata buffer spoofing
Lajos Molnar [Tue, 2 Aug 2016 14:07:05 +0000 (07:07 -0700)]
DO NOT MERGE: IOMX: work against metadata buffer spoofing

- Prohibit direct set/getParam/Settings for extensions meant for
  OMXNodeInstance alone. This disallows enabling metadata mode
  without the knowledge of OMXNodeInstance.
- Do not share metadata mode buffers cross process.
- Disallow setting up metadata mode/tunneling/input surface
  after first sendCommand. (Except to Idle state for OMXCodec quirk.)
- Disallow store-meta for input cross process.
- Disallow emptyBuffer for surface input (via IOMX).
- Fix checking for input surface.

[backported from L-MR1]

Bug: 29422020
Change-Id: I801c77b80e703903f62e42d76fd2e76a34e4bc8e

8 years agoDO NOT MERGE: IOMX: work against metadata buffer spoofing
Lajos Molnar [Tue, 2 Aug 2016 14:07:05 +0000 (07:07 -0700)]
DO NOT MERGE: IOMX: work against metadata buffer spoofing

- Prohibit direct set/getParam/Settings for extensions meant for
  OMXNodeInstance alone. This disallows enabling metadata mode
  without the knowledge of OMXNodeInstance.
- Do not share metadata mode buffers cross process.
- Disallow setting up metadata mode/input surface
  after first sendCommand (except to Idle for OMXCodec quirk).
- Disallow store-meta for input cross process.
- Disallow emptyBuffer for surface input (via IOMX).
- Fix checking for input surface.

[backported from L]

Bug: 29422020
Change-Id: I801c77b80e703903f62e42d76fd2e76a34e4bc8e

8 years agosoundtrigger: add size check on sound model and recogntion data
Eric Laurent [Wed, 17 Aug 2016 13:19:32 +0000 (06:19 -0700)]
soundtrigger: add size check on sound model and recogntion data

Bug: 30148546

Change-Id: I082f535a853c96571887eeea37c6d41ecee7d8c0
(cherry picked from commit bb00d8f139ff51336ab3c810d35685003949bcf8)

8 years agoDO NOT MERGE MediaPlayerService: avoid invalid static cast
Robert Shih [Tue, 16 Aug 2016 23:50:54 +0000 (16:50 -0700)]
DO NOT MERGE MediaPlayerService: avoid invalid static cast

Bug: 30204103
Change-Id: Ie0dd3568a375f1e9fed8615ad3d85184bcc99028

8 years agoDO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame.
Pawin Vongmasa [Tue, 19 Jul 2016 03:12:02 +0000 (20:12 -0700)]
DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame.

Also prevent overflow in SoftMPEG4 and division by zero in SoftMPEG4Encoder.

Bug: 30033990
Change-Id: I7701f5fc54c2670587d122330e5dc851f64ed3c2
(cherry picked from commit 695123195034402ca76169b195069c28c30342d3)

8 years agoDO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame.
Pawin Vongmasa [Tue, 19 Jul 2016 03:12:02 +0000 (20:12 -0700)]
DO NOT MERGE - SoftMPEG4: Check the buffer size before writing the reference frame.

Also prevent overflow in SoftMPEG4 and division by zero in SoftMPEG4Encoder.

Bug: 30033990
Change-Id: I7701f5fc54c2670587d122330e5dc851f64ed3c2
(cherry picked from commit 695123195034402ca76169b195069c28c30342d3)

8 years agoMediaPlayerService: avoid invalid static cast
Robert Shih [Tue, 16 Aug 2016 23:50:54 +0000 (16:50 -0700)]
MediaPlayerService: avoid invalid static cast

Bug: 30204103
Change-Id: Ie0dd3568a375f1e9fed8615ad3d85184bcc99028

8 years agobetter validation lengths of strings in ID3 tags
Ray Essick [Tue, 16 Aug 2016 21:24:43 +0000 (14:24 -0700)]
better validation lengths of strings in ID3 tags

Validate lengths on strings in ID3 tags, particularly around 0.
Also added code to handle cases when we can't get memory for
copies of strings we want to extract from these tags.

Affects L/M/N/master, same patch for all of them.

Bug: 30744884
Change-Id: I2675a817a39f0927ec1f7e9f9c09f2e61020311e
Test: play mp3 file which caused a <0 length.

8 years agoSoftMPEG4: Check the buffer size before writing the reference frame.
Pawin Vongmasa [Tue, 19 Jul 2016 03:12:02 +0000 (20:12 -0700)]
SoftMPEG4: Check the buffer size before writing the reference frame.

Also prevent overflow in SoftMPEG4 and division by zero in SoftMPEG4Encoder.

Bug: 30033990
Change-Id: I7701f5fc54c2670587d122330e5dc851f64ed3c2

8 years agoDO NOT MERGE omx: check buffer port before using
Wonsik Kim [Wed, 25 May 2016 07:54:08 +0000 (16:54 +0900)]
DO NOT MERGE omx: check buffer port before using

Bug: 28816827
Change-Id: I3d5bad4a1ef96dec544b05bb31cc6f7109aae0a5

8 years agoMerge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-mr1-dev
TreeHugger Robot [Mon, 1 Aug 2016 22:05:02 +0000 (22:05 +0000)]
Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-mr1-dev

8 years agoDO NOT MERGE - stagefright: fix integer overflow error
Wonsik Kim [Thu, 21 Jul 2016 05:43:38 +0000 (14:43 +0900)]
DO NOT MERGE - stagefright: fix integer overflow error

Bug: 30103394
Change-Id: If449d3e30a0bf2ebea5317f41813bfed094f7408
(cherry picked from commit 2c74a3cd5d1d66b9a35424b9c4443dafa6db5bef)

8 years agoMerge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-dev
Wonsik Kim [Mon, 1 Aug 2016 21:11:24 +0000 (21:11 +0000)]
Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-dev
am: 8f4b1a7de0  -s ours

Change-Id: I5ccb9ee7ddd79e6a3599c1e53ff0247c0af50bf4

8 years agoDO NOT MERGE - stagefright: fix integer overflow error
Wonsik Kim [Mon, 1 Aug 2016 21:11:23 +0000 (21:11 +0000)]
DO NOT MERGE - stagefright: fix integer overflow error
am: f4f36a0a31  -s ours

Change-Id: I5f7bb034371e3651a00a6023352b871eeeb9740a

8 years agoMerge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-dev
Marco Nelissen [Mon, 1 Aug 2016 21:08:39 +0000 (21:08 +0000)]
Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-dev

8 years agoDO NOT MERGE - stagefright: fix integer overflow error am: 17a10c50e2 am: 8df5df78a3...
Wonsik Kim [Mon, 1 Aug 2016 20:35:41 +0000 (20:35 +0000)]
DO NOT MERGE - stagefright: fix integer overflow error am: 17a10c50e2 am: 8df5df78a3 am: e40e452a3a  -s ours
am: 87d4805d94  -s ours

Change-Id: I7316ed78d4308e8528a79ec2f2ea7708164401ad

8 years agoDO NOT MERGE - stagefright: fix integer overflow error am: 17a10c50e2 am: 8df5df78a3
Wonsik Kim [Mon, 1 Aug 2016 20:33:17 +0000 (20:33 +0000)]
DO NOT MERGE - stagefright: fix integer overflow error am: 17a10c50e2 am: 8df5df78a3
am: e40e452a3a  -s ours

Change-Id: Ib76f39590bc10ace428d2e142db1f752ac3567c6

8 years agoDO NOT MERGE - stagefright: fix integer overflow error am: 17a10c50e2
Wonsik Kim [Mon, 1 Aug 2016 20:30:39 +0000 (20:30 +0000)]
DO NOT MERGE - stagefright: fix integer overflow error am: 17a10c50e2
am: 8df5df78a3

Change-Id: Iba844e14f530d15531c5b47e7aaaedfd7849813b

8 years agoDO NOT MERGE - stagefright: fix integer overflow error
Wonsik Kim [Mon, 1 Aug 2016 20:28:10 +0000 (20:28 +0000)]
DO NOT MERGE - stagefright: fix integer overflow error
am: 17a10c50e2

Change-Id: I310e406b5370678b112f5ad0603e22456d6c3de7

8 years agoDO NOT MERGE - stagefright: fix integer overflow error
Wonsik Kim [Thu, 21 Jul 2016 05:43:38 +0000 (14:43 +0900)]
DO NOT MERGE - stagefright: fix integer overflow error

Bug: 30103394
Change-Id: If449d3e30a0bf2ebea5317f41813bfed094f7408
(cherry picked from commit 2c74a3cd5d1d66b9a35424b9c4443dafa6db5bef)