OSDN Git Service
Lajos Molnar [Fri, 9 Sep 2016 16:54:42 +0000 (16:54 +0000)]
DO NOT MERGE: IOMX: work against metadata buffer spoofing
am:
9a4768f7bf
Change-Id: Ib611c8e1abdff62df4f8067c1bb7a5e2dd18c328
Wonsik Kim [Fri, 9 Sep 2016 16:54:37 +0000 (16:54 +0000)]
DO NOT MERGE omx: check buffer port before using
am:
0e2cc67785
Change-Id: Ie5692f86d9cbb0b2c890517b6f5f1b0db1e7c281
Wei Jia [Wed, 31 Aug 2016 00:13:56 +0000 (00:13 +0000)]
MediaPlayerService: allow next player to be NULL am:
2828412787 am:
f4e00a7c5a am:
0dd714e408 am:
de97dbd662
am:
a7549d3dce
Change-Id: I56c379ef39b1fd80493798de79a61db140646c50
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
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
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
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
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
Robert Shih [Mon, 22 Aug 2016 18:36:26 +0000 (18:36 +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
am:
a9c1e43d89
Change-Id: I4d35b92457c636f413ae03a992f71844028dfa90
Robert Shih [Mon, 22 Aug 2016 18:36:25 +0000 (18:36 +0000)]
DO NOT MERGE MediaPlayerService: avoid invalid static cast am:
c159a5ae12 am:
2cee1deec9 am:
48b3aca54b -s ours am:
08eab78209 -s ours
am:
081388d875
Change-Id: I685261698d0ecb4e77b5e78aab83b2b38b6a91fb
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
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
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
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
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
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
Robert Shih [Mon, 22 Aug 2016 18:17:19 +0000 (18:17 +0000)]
Merge "MediaPlayerService: avoid invalid static cast" into lmp-dev am:
e35213de2d
am:
21cc1102b4
Change-Id: Ifb645a0070300d95e4091969c25ff27d4615b56f
Robert Shih [Mon, 22 Aug 2016 18:17:18 +0000 (18:17 +0000)]
MediaPlayerService: avoid invalid static cast am:
ee0a0e39ac
am:
7b6a85546c
Change-Id: Idacdce87d96ca64f0bfb06b41c65b5a870515b69
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
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
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
Robert Shih [Mon, 22 Aug 2016 18:12:48 +0000 (18:12 +0000)]
MediaPlayerService: avoid invalid static cast
am:
ee0a0e39ac
Change-Id: I2e857a57fe87c5050b1042d27c8e3034df2a462c
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
Robert Shih [Mon, 22 Aug 2016 17:53:05 +0000 (17:53 +0000)]
Merge "MediaPlayerService: avoid invalid static cast" into lmp-dev
Andy Hung [Fri, 19 Aug 2016 21:39:07 +0000 (21:39 +0000)]
Merge "soundtrigger: add size check on sound model and recogntion data" into lmp-dev am:
36e11a4c23
am:
d959102420
Change-Id: I0ee357acf175c17d5b7d98860a422135d097ba9a
Eric Laurent [Fri, 19 Aug 2016 21:39:04 +0000 (21:39 +0000)]
soundtrigger: add size check on sound model and recogntion data am:
ef0c915184
am:
82477c0929
Change-Id: I7b62641fefce7c3ee2c8c4a55363c1799d066349
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
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
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
Andy Hung [Fri, 19 Aug 2016 19:14:15 +0000 (19:14 +0000)]
Merge "Add EFFECT_CMD_SET_PARAM parameter checking" into klp-dev am:
9665548a42 am:
19294437ac am:
53657baf41 am:
6cc3c2dc98
am:
34334a97ed
Change-Id: Ia58dc8c5d784945c201e95bb3e3d5a03fed040c7
Andy Hung [Fri, 19 Aug 2016 19:14:15 +0000 (19:14 +0000)]
Add EFFECT_CMD_SET_PARAM parameter checking am:
e4a1d91501 am:
19d8a61324 am:
ebd9f1029e am:
d37cf46848
am:
ced0dd635e
Change-Id: Ib7b99e6cf6a15050e956df86b52720ad0b04dfdc
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
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
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
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
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
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
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
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
Andy Hung [Fri, 19 Aug 2016 18:49:14 +0000 (18:49 +0000)]
Merge "Add EFFECT_CMD_SET_PARAM parameter checking" into klp-dev
Pawin Vongmasa [Fri, 19 Aug 2016 17:11:29 +0000 (17:11 +0000)]
DO NOT MERGE - Fix build breakage caused by commit
940829f69b52d6038db66a9c727534636ecc456d. am:
ad929db743 am:
453ba68c65 am:
2a21f09fff -s ours am:
83cf293b73 -s ours
am:
45cd2f896b
Change-Id: If0d77fc4311666cff881c371167fd19a534d0fb2
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
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
Pawin Vongmasa [Fri, 19 Aug 2016 17:00:34 +0000 (17:00 +0000)]
Merge "Fix build breakage caused by commit
940829f69b52d6038db66a9c727534636ecc456d." into lmp-dev am:
7a66bd2404
am:
c776d9b42f
Change-Id: I202194b9bf1167ab437eb18edd548512e6713bff
Pawin Vongmasa [Fri, 19 Aug 2016 17:00:33 +0000 (17:00 +0000)]
Fix build breakage caused by commit
940829f69b52d6038db66a9c727534636ecc456d. am:
baa9146401
am:
0aaa2c606c
Change-Id: I9b705a7105e5e6abb0370837f4927e33ab504e3e
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
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
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
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
Pawin Vongmasa [Fri, 19 Aug 2016 16:53:17 +0000 (16:53 +0000)]
Merge "Fix build breakage caused by commit
940829f69b52d6038db66a9c727534636ecc456d." into lmp-dev
Ray Essick [Fri, 19 Aug 2016 16:41:01 +0000 (16:41 +0000)]
Merge "better validation lengths of strings in ID3 tags" into lmp-dev am:
ae12b68ba2
am:
5bc68fd641
Change-Id: I3d52b464d1ebced3381dc3813ac29fbe91b15d9e
Ray Essick [Fri, 19 Aug 2016 16:41:01 +0000 (16:41 +0000)]
better validation lengths of strings in ID3 tags am:
d23c01546c
am:
e3fad118bb
Change-Id: I14bb5fbc1d7f97cf178b56699fd61131745b1a0e
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
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
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
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
Pawin Vongmasa [Fri, 19 Aug 2016 09:07:33 +0000 (02:07 -0700)]
Fix build breakage caused by commit
940829f69b52d6038db66a9c727534636ecc456d.
Change-Id: I4776db4a26fb3c31bb994d48788373fe569c812a
Pawin Vongmasa [Fri, 19 Aug 2016 02:54:04 +0000 (02:54 +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
am:
348a267300
Change-Id: I594edffee48c52277de18e760aef5bf7916756b3
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
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:
180185da19 -s ours
am:
5d50c6e5e0
Change-Id: I82c5a285bb7464070072d11d05116cd69e837947
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
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
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
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
Pawin Vongmasa [Fri, 19 Aug 2016 02:37:06 +0000 (02:37 +0000)]
SoftMPEG4: Check the buffer size before writing the reference frame.
am:
6951231950
Change-Id: I594a73e3b3a2002608675ac38e23c6b2764bd0d2
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
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
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)
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
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)
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)
Robert Shih [Tue, 16 Aug 2016 23:50:54 +0000 (16:50 -0700)]
MediaPlayerService: avoid invalid static cast
Bug:
30204103
Change-Id: Ie0dd3568a375f1e9fed8615ad3d85184bcc99028
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.
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
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
Wonsik Kim [Mon, 1 Aug 2016 22:08:22 +0000 (22:08 +0000)]
Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-mr1-dev
am:
ee58cd8522
Change-Id: I0a099a5fc8d3c4c188380b78c7acf8c4239c8b38
Wonsik Kim [Mon, 1 Aug 2016 22:08:21 +0000 (22:08 +0000)]
DO NOT MERGE - stagefright: fix integer overflow error
am:
2d58796ded
Change-Id: Iee9435171a7566f60f48c657c6fada505e2eda90
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
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)
Marco Nelissen [Mon, 1 Aug 2016 21:13:52 +0000 (21:13 +0000)]
Merge "DO NOT MERGE - stagefright: fix integer overflow error" into lmp-dev am:
8f4b1a7de0 -s ours
am:
64c06e051a
Change-Id: I089103c8f98f6819bfe2e6ce3d229bdf5d9ddb9c
Wonsik Kim [Mon, 1 Aug 2016 21:13:52 +0000 (21:13 +0000)]
DO NOT MERGE - stagefright: fix integer overflow error am:
f4f36a0a31 -s ours
am:
4efaa1bca7
Change-Id: I0323e79f8297797599cd5ae3e5ae06ec81254128
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
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
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
Wonsik Kim [Mon, 1 Aug 2016 20:38:12 +0000 (20:38 +0000)]
DO NOT MERGE - stagefright: fix integer overflow error am:
17a10c50e2 am:
8df5df78a3 am:
e40e452a3a -s ours am:
87d4805d94 -s ours
am:
3041de70c5
Change-Id: Ifab7545acb5b56f5c0c55f43ceb748f4794f2456
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
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
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
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
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)
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)
Wonsik Kim [Tue, 19 Jul 2016 22:56:49 +0000 (22:56 +0000)]
omx: prevent input port enable/disable for software codecs am:
2b94fa8277 am:
c83b53c9e5 am:
f054728108 am:
062fd4a341
am:
45fb504379
Change-Id: I309cc67d0a97c88e18182b7435e5b271355e4772
Wonsik Kim [Tue, 19 Jul 2016 22:54:16 +0000 (22:54 +0000)]
omx: prevent input port enable/disable for software codecs am:
2b94fa8277 am:
c83b53c9e5 am:
f054728108
am:
062fd4a341
Change-Id: I979b1c6b415b83d11f1a0c24b7fe54fe79556676
Wonsik Kim [Tue, 19 Jul 2016 22:51:43 +0000 (22:51 +0000)]
omx: prevent input port enable/disable for software codecs am:
2b94fa8277 am:
c83b53c9e5
am:
f054728108
Change-Id: I230da4ea86abf01ff9057900f0eea1af151c9a00
Wonsik Kim [Tue, 19 Jul 2016 22:46:54 +0000 (22:46 +0000)]
omx: prevent input port enable/disable for software codecs am:
2b94fa8277
am:
c83b53c9e5
Change-Id: I6eeb301a2418cae6a57e49ed29527edd5e8de2b0
Wonsik Kim [Tue, 19 Jul 2016 22:44:18 +0000 (22:44 +0000)]
omx: prevent input port enable/disable for software codecs
am:
2b94fa8277
Change-Id: I5c370c34986be1435f2d0eebae8e264c0f4f0f44
Wonsik Kim [Thu, 7 Jul 2016 03:57:02 +0000 (12:57 +0900)]
omx: prevent input port enable/disable for software codecs
Bug:
29421804
Change-Id: Iba1011e9af942a6dff7f659af769a51e3f5ba66f
Robert Shih [Thu, 14 Jul 2016 23:09:06 +0000 (23:09 +0000)]
DO NOT MERGE - Fix build am:
bf835e4525 am:
98b31b9270 am:
1038762b09 -s ours am:
5d925fce78 -s ours
am:
0576ffb637
Change-Id: Ieab310032dbf29bab829c7b01225d84fd3df354c
Robert Shih [Thu, 14 Jul 2016 23:06:31 +0000 (23:06 +0000)]
DO NOT MERGE - Fix build am:
bf835e4525 am:
98b31b9270 am:
1038762b09 -s ours
am:
5d925fce78 -s ours
Change-Id: Ie8c4b4df445063c09bfaf9a1e987798c6d1df978
Robert Shih [Thu, 14 Jul 2016 23:04:02 +0000 (23:04 +0000)]
DO NOT MERGE - Fix build am:
bf835e4525 am:
98b31b9270
am:
1038762b09 -s ours
Change-Id: I43d1bdb6bd3f432b44513687d1736fc344c68f9a