OSDN Git Service
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: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 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: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: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: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 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: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: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: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
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
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.
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: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: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:04:02 +0000 (23:04 +0000)]
DO NOT MERGE - Fix build am:
bf835e4525 am:
98b31b9270
am:
1038762b09 -s ours
Change-Id: I43d1bdb6bd3f432b44513687d1736fc344c68f9a
Robert Shih [Thu, 14 Jul 2016 23:01:31 +0000 (23:01 +0000)]
DO NOT MERGE - Fix build am:
bf835e4525
am:
98b31b9270
Change-Id: Ib3dd2d315096bcb31dbfcd5be66f00d482594c9b
Robert Shih [Thu, 14 Jul 2016 22:58:30 +0000 (22:58 +0000)]
DO NOT MERGE - Fix build
am:
bf835e4525
Change-Id: Idd0b7779345c8b4c595681de7431c3339b44129e
Robert Shih [Thu, 14 Jul 2016 22:32:08 +0000 (15:32 -0700)]
DO NOT MERGE - Fix build
Change-Id: Iff47bb735778fb275abeee573c636856b839feb5
Robert Shih [Thu, 14 Jul 2016 18:06:19 +0000 (18:06 +0000)]
Merge "DO NOT MERGE - SoftMP3: memset safely" into lmp-dev
Sergio Giro [Thu, 14 Jul 2016 17:36:23 +0000 (17:36 +0000)]
Merge "DO NOT MERGE Add bound checks to utf16_to_utf8" into lmp-dev
Sergio Giro [Tue, 28 Jun 2016 17:24:52 +0000 (18:24 +0100)]
DO NOT MERGE Add bound checks to utf16_to_utf8
Bug:
29250543
(cherry picked from commit
1d3f4278b2666d1a145af2f54782c993aa07d1d9)
Change-Id: Id4ffb4bee02c3bd53796723b4cbcc88e693f8e83
Robert Shih [Thu, 14 Jul 2016 01:41:18 +0000 (01:41 +0000)]
Merge \\\"DO NOT MERGE - SoftMP3: memset safely\\\" into klp-dev am:
3242dcf6e9 am:
f4ad14f154
am:
e3c1c2d734 -s ours
Change-Id: I018c8bedc4d810b7abca34ff4273e249ebc0648f
Robert Shih [Thu, 14 Jul 2016 01:37:58 +0000 (01:37 +0000)]
Merge \\"DO NOT MERGE - SoftMP3: memset safely\\" into klp-dev am:
3242dcf6e9
am:
f4ad14f154
Change-Id: Iec5f4a53a3db5fbb40bfecd4bddf4b3f607ae450
Robert Shih [Thu, 14 Jul 2016 01:31:29 +0000 (01:31 +0000)]
Merge \"DO NOT MERGE - SoftMP3: memset safely\" into klp-dev
am:
3242dcf6e9
Change-Id: I09c381c92c7efeacc95c611b2775d875a6202027
Robert Shih [Thu, 14 Jul 2016 01:28:42 +0000 (01:28 +0000)]
Merge \\\"DO NOT MERGE - SoftVPX: fix nFilledLen overflow\\\" into klp-dev am:
91ad8847ab am:
74b10b831c
am:
6bdf8cb440 -s ours
Change-Id: Id01ce97ff7add25f1f0b067440916e9d299a740b
Robert Shih [Thu, 14 Jul 2016 01:28:41 +0000 (01:28 +0000)]
Merge \\\"OMXCodec: check IMemory::pointer() before using allocation\\\" into klp-dev am:
f545c72b97 am:
d89781f3be
am:
c9c40b829f
Change-Id: I5facfd78f7050928d30c86585036128749b1f292
Robert Shih [Thu, 14 Jul 2016 01:26:14 +0000 (01:26 +0000)]
Merge "DO NOT MERGE - SoftMP3: memset safely" into klp-dev
Robert Shih [Thu, 14 Jul 2016 01:25:31 +0000 (01:25 +0000)]
Merge \\"DO NOT MERGE - SoftVPX: fix nFilledLen overflow\\" into klp-dev am:
91ad8847ab
am:
74b10b831c
Change-Id: I2b300c5f4993d4beb866e4f1c94eb4fece1149e2
Robert Shih [Thu, 14 Jul 2016 01:25:30 +0000 (01:25 +0000)]
Merge \\"OMXCodec: check IMemory::pointer() before using allocation\\" into klp-dev am:
f545c72b97
am:
d89781f3be
Change-Id: Iae2cc6d8f4512e7e1f4273bbb28b292337e291b6
Robert Shih [Thu, 14 Jul 2016 01:22:56 +0000 (01:22 +0000)]
Merge \"DO NOT MERGE - SoftVPX: fix nFilledLen overflow\" into klp-dev
am:
91ad8847ab
Change-Id: I66eec25f4bc143dd5d67b9bb77825f6e6c732880
Robert Shih [Thu, 14 Jul 2016 01:22:56 +0000 (01:22 +0000)]
Merge \"OMXCodec: check IMemory::pointer() before using allocation\" into klp-dev
am:
f545c72b97
Change-Id: I9206ce86485cb3acc2540d135f6beacc03bb38f5
Robert Shih [Thu, 14 Jul 2016 01:18:10 +0000 (01:18 +0000)]
Merge "DO NOT MERGE - SoftVPX: fix nFilledLen overflow" into klp-dev
Robert Shih [Thu, 14 Jul 2016 01:16:52 +0000 (01:16 +0000)]
Merge "OMXCodec: check IMemory::pointer() before using allocation" into klp-dev
Robert Shih [Mon, 27 Jun 2016 20:55:14 +0000 (13:55 -0700)]
DO NOT MERGE - SoftMP3: memset safely
Bug:
29422022
Change-Id: I70c9e33269d16bf8c163815706ac24e18e34fe97
Robert Shih [Mon, 27 Jun 2016 20:55:14 +0000 (13:55 -0700)]
DO NOT MERGE - SoftMP3: memset safely
Bug:
29422022
Change-Id: I70c9e33269d16bf8c163815706ac24e18e34fe97
Robert Shih [Fri, 24 Jun 2016 19:37:45 +0000 (12:37 -0700)]
DO NOT MERGE - SoftVPX: fix nFilledLen overflow
Bug:
29421675
Change-Id: I25d4cf54a5df22c2130c37e95c7c7f75063111f3
Robert Shih [Fri, 24 Jun 2016 19:37:45 +0000 (12:37 -0700)]
DO NOT MERGE - SoftVPX: fix nFilledLen overflow
Bug:
29421675
Change-Id: I25d4cf54a5df22c2130c37e95c7c7f75063111f3
Ray Essick [Wed, 13 Jul 2016 22:43:51 +0000 (22:43 +0000)]
Merge \\\"Fix corruption via buffer overflow in mediaserver\\\" into klp-dev am:
b5299033ce am:
357e0f132e
am:
efa1272404
Change-Id: Ia5996291c99df58d5986195424ce98ea354e6a8b
Ray Essick [Wed, 13 Jul 2016 22:41:18 +0000 (22:41 +0000)]
Merge \\"Fix corruption via buffer overflow in mediaserver\\" into klp-dev am:
b5299033ce
am:
357e0f132e
Change-Id: Ia387bc54c8d51975aa4c938616a43e47cb3338d9
Ray Essick [Wed, 13 Jul 2016 22:38:29 +0000 (22:38 +0000)]
Merge \"Fix corruption via buffer overflow in mediaserver\" into klp-dev
am:
b5299033ce
Change-Id: I774cb0256be49317851488879221a1c3602148f3
Ray Essick [Wed, 13 Jul 2016 22:12:57 +0000 (22:12 +0000)]
Merge "Fix corruption via buffer overflow in mediaserver" into klp-dev
Wonsik Kim [Wed, 13 Jul 2016 04:00:37 +0000 (04:00 +0000)]
Merge \\\"DO NOT MERGE stagefright: fix possible stack overflow in AVCC reassemble\\\" into klp-dev am:
b239e27433 am:
cc3c549065
am:
19ca2d2486 -s ours
Change-Id: I1fc5df6c606b357c59fca2dc90e716c5ce7d266c
Wonsik Kim [Wed, 13 Jul 2016 03:56:57 +0000 (03:56 +0000)]
Merge \\"DO NOT MERGE stagefright: fix possible stack overflow in AVCC reassemble\\" into klp-dev am:
b239e27433
am:
cc3c549065
Change-Id: I772fba4484975a2f28fc947e4a16296b400f5a99
Wonsik Kim [Wed, 13 Jul 2016 03:45:39 +0000 (03:45 +0000)]
Merge \"DO NOT MERGE stagefright: fix possible stack overflow in AVCC reassemble\" into klp-dev
am:
b239e27433
Change-Id: I2f3e5b3b1e4451506e7c66ced8222137d504abdb
Wonsik Kim [Wed, 13 Jul 2016 03:32:16 +0000 (03:32 +0000)]
Merge "DO NOT MERGE stagefright: fix possible stack overflow in AVCC reassemble" into klp-dev
Wonsik Kim [Wed, 13 Jul 2016 03:32:08 +0000 (03:32 +0000)]
Merge "DO NOT MERGE stagefright: fix possible stack overflow in AVCC reassemble" into lmp-dev
Robert Shih [Wed, 13 Jul 2016 01:00:53 +0000 (18:00 -0700)]
OMXCodec: check IMemory::pointer() before using allocation
Bug:
29421811
Change-Id: I0a73ba12bae4122f1d89fc92e5ea4f6a96cd1ed1
Pawin Vongmasa [Mon, 11 Jul 2016 21:09:10 +0000 (21:09 +0000)]
Impose a size bound for dynamically allocated tables in stbl. am:
583a012a9f am:
34519820bf
am:
726010eb1f
Change-Id: Id4fd4a863d083b27286e7b3abf7897ca8f20b798
Pawin Vongmasa [Mon, 11 Jul 2016 21:06:45 +0000 (21:06 +0000)]
Impose a size bound for dynamically allocated tables in stbl. am:
583a012a9f
am:
34519820bf
Change-Id: Ie338b5b5c726137d173caa97e3a1b428d04d1837
Pawin Vongmasa [Mon, 11 Jul 2016 21:03:59 +0000 (21:03 +0000)]
Impose a size bound for dynamically allocated tables in stbl.
am:
583a012a9f
Change-Id: Ide23dfb85980fe89f3b7b536894947981ccd7aaf
Ray Essick [Wed, 6 Jul 2016 17:13:25 +0000 (10:13 -0700)]
Fix corruption via buffer overflow in mediaserver
change unbound sprintf() to snprintf() so network-provided values
can't overflow the buffers.
Applicable to all K/L/M/N branches.
Bug:
25747670
Change-Id: Id6a5120c2d08a6fbbd47deffb680ecf82015f4f6
Wonsik Kim [Thu, 16 Jun 2016 16:24:30 +0000 (01:24 +0900)]
DO NOT MERGE stagefright: fix possible stack overflow in AVCC reassemble
Additionally, remove use of variable length array which is
non-standard in C++.
Bug:
29161888
Change-Id: Ifdc3e7435f2225214c053b13f3bfe71c7d0ff506
Wonsik Kim [Thu, 16 Jun 2016 16:24:30 +0000 (01:24 +0900)]
DO NOT MERGE stagefright: fix possible stack overflow in AVCC reassemble
Additionally, remove use of variable length array which is
non-standard in C++.
Bug:
29161888
Change-Id: Ifdc3e7435f2225214c053b13f3bfe71c7d0ff506
Pawin Vongmasa [Wed, 22 Jun 2016 02:10:21 +0000 (19:10 -0700)]
Impose a size bound for dynamically allocated tables in stbl.
Impose a restriction of 200MiB for tables in stsc, stts, ctts and stss
boxes. Also change mTimeToSample from Vector to array.
Bug:
29367429
Change-Id: I953bea9fe0590268cf27376740f582dc88563d42
Wonsik Kim [Wed, 22 Jun 2016 18:36:14 +0000 (18:36 +0000)]
Merge \\\"Revert \\\"Impose a size bound for dynamically allocated tables in stbl.\\\"\\\" into klp-dev am:
7e6bd6a911 am:
3ad7688745
am:
9d65d13cc7
Change-Id: Ib8d8f9c58c1ffb169cf488d57fb841f80a664e97
Wonsik Kim [Wed, 22 Jun 2016 18:33:49 +0000 (18:33 +0000)]
Merge \\"Revert \\"Impose a size bound for dynamically allocated tables in stbl.\\"\\" into klp-dev am:
7e6bd6a911
am:
3ad7688745
Change-Id: I02de46ed2ce14428a45826270b557426ee2aaf47
Wonsik Kim [Wed, 22 Jun 2016 18:31:13 +0000 (18:31 +0000)]
Merge \"Revert \"Impose a size bound for dynamically allocated tables in stbl.\"\" into klp-dev
am:
7e6bd6a911
Change-Id: Id0ca80f03ee0426730951f7961ef903c29d3c6ef
Wonsik Kim [Wed, 22 Jun 2016 18:27:32 +0000 (18:27 +0000)]
Merge "Revert "Impose a size bound for dynamically allocated tables in stbl."" into klp-dev
Wonsik Kim [Wed, 22 Jun 2016 18:19:15 +0000 (18:19 +0000)]
Revert "Impose a size bound for dynamically allocated tables in stbl."
This reverts commit
25e029746796fe88e82417fb01af2e27b8bbadb2.
Change-Id: I91225838a8be72a3cd413f2bcb99e7dca7e62929
Pawin Vongmasa [Wed, 22 Jun 2016 17:58:26 +0000 (17:58 +0000)]
Merge \\\"Impose a size bound for dynamically allocated tables in stbl.\\\" into klp-dev am:
8f73edb22a am:
a263248bf0
am:
4c969bf93f
Change-Id: I6258bac89bbe02e47b3c912df26f26033d7b76b4
Wonsik Kim [Wed, 22 Jun 2016 17:55:12 +0000 (17:55 +0000)]
Merge \\"Impose a size bound for dynamically allocated tables in stbl.\\" into klp-dev am:
8f73edb22a
am:
a263248bf0
Change-Id: I0389073f6b18450edc8fa70ed3ec72683a166915
Pawin Vongmasa [Wed, 22 Jun 2016 17:51:55 +0000 (17:51 +0000)]
Merge \"Impose a size bound for dynamically allocated tables in stbl.\" into klp-dev
am:
8f73edb22a
Change-Id: I2dfcb7ee560fdd01f6800a34d50397ac4f71798f
Wonsik Kim [Wed, 22 Jun 2016 17:38:54 +0000 (17:38 +0000)]
Merge "Impose a size bound for dynamically allocated tables in stbl." into klp-dev
Pawin Vongmasa [Wed, 22 Jun 2016 02:10:21 +0000 (19:10 -0700)]
Impose a size bound for dynamically allocated tables in stbl.
Impose a restriction of 200MiB for tables in stsc, stts, ctts and stss
boxes. Also change Vector to std::vector for efficiency and consistency.
Bug:
29367429
Change-Id: I175da524612b9fe68496c612966af51f01a5cd5e
Eino-Ville Talvala [Tue, 21 Jun 2016 22:06:36 +0000 (22:06 +0000)]
Merge \\\"DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak\\\" into klp-dev am:
22d6575710 am:
4bec033ded
am:
5c1f01675c -s ours
Change-Id: I9a27186dd8c57aaf4a7c0385c2c521945c6fcd1e
Eino-Ville Talvala [Tue, 21 Jun 2016 22:03:33 +0000 (22:03 +0000)]
Merge \\"DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak\\" into klp-dev am:
22d6575710
am:
4bec033ded
Change-Id: I68dd7d3ea94b10104c235007fd03230ef5ae0146
Eino-Ville Talvala [Tue, 21 Jun 2016 22:00:22 +0000 (22:00 +0000)]
Merge \"DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak\" into klp-dev
am:
22d6575710
Change-Id: I0c2a4ebf1ce1e47a819f2ea2e67ea4bb6f055526
Eino-Ville Talvala [Tue, 21 Jun 2016 21:57:34 +0000 (21:57 +0000)]
Merge "DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak" into klp-dev
Eino-Ville Talvala [Tue, 21 Jun 2016 21:57:34 +0000 (21:57 +0000)]
Merge "DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak" into lmp-dev
Wonsik Kim [Tue, 21 Jun 2016 17:41:27 +0000 (17:41 +0000)]
Merge \\\"DO NOT MERGE omx: check buffer port before using\\\" into klp-dev am:
5713902f6a am:
1410b5034f
am:
8b35cb563d -s ours
Change-Id: I40733cfbad5dac51eceb5e09ad3cad4688bea63e
Andy Hung [Tue, 21 Jun 2016 17:41:26 +0000 (17:41 +0000)]
Check effect command reply size in AudioFlinger am:
110bc9547a am:
075c8f7713
am:
c971a59f4c
Change-Id: I86d971f1a537a34e90e4f0697c9c9a43e509cfc4