OSDN Git Service
Wonsik Kim [Wed, 22 Jun 2016 18:11:22 +0000 (18:11 +0000)]
Merge \\\\\\"Impose a size bound for dynamically allocated tables in stbl.\\\\\\" into klp-dev am:
8f73edb22a am:
a263248bf0 am:
4c969bf93f am:
7e06799472 am:
fcb008b743
am:
26dc0a2a91
Change-Id: Ic91093f89dad5ada3f6997b7dff1557e726099c4
Pawin Vongmasa [Wed, 22 Jun 2016 18:07:16 +0000 (18:07 +0000)]
Merge \\\\\"Impose a size bound for dynamically allocated tables in stbl.\\\\\" into klp-dev am:
8f73edb22a am:
a263248bf0 am:
4c969bf93f am:
7e06799472
am:
fcb008b743
Change-Id: I3527f060a0f723c047081c70d83e0a18dfadf119
Wonsik Kim [Wed, 22 Jun 2016 18:01:43 +0000 (18:01 +0000)]
Merge \\\\"Impose a size bound for dynamically allocated tables in stbl.\\\\" into klp-dev am:
8f73edb22a am:
a263248bf0 am:
4c969bf93f
am:
7e06799472
Change-Id: I4c877fcf9839e44ca849d25f46ba55f74cd0064e
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:17:37 +0000 (22:17 +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 am:
495ba35a17 -s ours am:
f45a909f14
am:
aec4789b06
Change-Id: I8d30a1d2c304de0f3ce748e03a975c46bbc6164e
Eino-Ville Talvala [Tue, 21 Jun 2016 22:14:04 +0000 (22:14 +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 am:
495ba35a17 -s ours
am:
f45a909f14
Change-Id: I5f316563ea3551f03409d95daf21aab453e60711
Eino-Ville Talvala [Tue, 21 Jun 2016 22:10:41 +0000 (22:10 +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
am:
495ba35a17 -s ours
Change-Id: I68de90dcbd6453609197e3fb7b0f8f7c4473e482
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:06:30 +0000 (22:06 +0000)]
Merge \\\"DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak\\\" into lmp-dev am:
f832feb17b -s ours am:
817545929d
am:
4ba6f225ec
Change-Id: I14b593fa50f2a22d76ebc04c040838836c9af362
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:03:32 +0000 (22:03 +0000)]
Merge \\"DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak\\" into lmp-dev am:
f832feb17b -s ours
am:
817545929d
Change-Id: I0cdde9b06adb1f522783df3e35943fd761090cca
Eino-Ville Talvala [Tue, 21 Jun 2016 22:00:23 +0000 (22:00 +0000)]
Merge \"DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak\" into lmp-dev
am:
f832feb17b -s ours
Change-Id: I120a53e20423bd4df63a22e1abf8aee54f12cc9d
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:49:41 +0000 (17:49 +0000)]
Merge \\\\\\"DO NOT MERGE omx: check buffer port before using\\\\\\" into klp-dev am:
5713902f6a am:
1410b5034f am:
8b35cb563d -s ours am:
71676a9dc4 -s ours am:
6a2a3ed69e
am:
f63f606a8e
Change-Id: I15845a3e06589f6e2ab65264c64f783069cee498
Andy Hung [Tue, 21 Jun 2016 17:49:41 +0000 (17:49 +0000)]
Check effect command reply size in AudioFlinger am:
110bc9547a am:
075c8f7713 am:
c971a59f4c am:
195f7c6125 am:
1e1b7e4c3d
am:
d34a9dfc5e
Change-Id: I2705198deaaeb485503135fe97bc0d6f5ba8cf70
Wonsik Kim [Tue, 21 Jun 2016 17:47:04 +0000 (17:47 +0000)]
Merge \\\\\"DO NOT MERGE omx: check buffer port before using\\\\\" into klp-dev am:
5713902f6a am:
1410b5034f am:
8b35cb563d -s ours am:
71676a9dc4 -s ours
am:
6a2a3ed69e
Change-Id: I62ebdb3da8b5c1cba67e3143e1c67a9fe7b1ec7c
Andy Hung [Tue, 21 Jun 2016 17:47:03 +0000 (17:47 +0000)]
Check effect command reply size in AudioFlinger am:
110bc9547a am:
075c8f7713 am:
c971a59f4c am:
195f7c6125
am:
1e1b7e4c3d
Change-Id: I6558d45c768225007c53016542459cec3dd1387f
Wonsik Kim [Tue, 21 Jun 2016 17:44:06 +0000 (17:44 +0000)]
Merge \\\\"DO NOT MERGE omx: check buffer port before using\\\\" into klp-dev am:
5713902f6a am:
1410b5034f am:
8b35cb563d -s ours
am:
71676a9dc4 -s ours
Change-Id: I4ed0d5198d2f4f892b72f4a0c8f6986355dbc1e3
Andy Hung [Tue, 21 Jun 2016 17:44:05 +0000 (17:44 +0000)]
Check effect command reply size in AudioFlinger am:
110bc9547a am:
075c8f7713 am:
c971a59f4c
am:
195f7c6125
Change-Id: I8da29433f8dabffc94a82617e325a314c4ae84d0
Wonsik Kim [Tue, 21 Jun 2016 17:41:31 +0000 (17:41 +0000)]
DO NOT MERGE omx: check buffer port before using am:
719fd3c062 -s ours am:
924aa78614
am:
f9b986afc2
Change-Id: Ifdb8ed877986271a741fa8035384931a0d387904
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
Wonsik Kim [Tue, 21 Jun 2016 17:38:38 +0000 (17:38 +0000)]
Merge \\"DO NOT MERGE omx: check buffer port before using\\" into klp-dev am:
5713902f6a
am:
1410b5034f
Change-Id: Ib6d17c24784c51a7301094d69a08d13693a1dd16
Wonsik Kim [Tue, 21 Jun 2016 17:38:38 +0000 (17:38 +0000)]
DO NOT MERGE omx: check buffer port before using am:
719fd3c062 -s ours
am:
924aa78614
Change-Id: I1c1c4f0a72d626a6aa035601b5d3948cedb814ee
Andy Hung [Tue, 21 Jun 2016 17:38:37 +0000 (17:38 +0000)]
Check effect command reply size in AudioFlinger am:
110bc9547a
am:
075c8f7713
Change-Id: I7b70873d12dc258b362c88c8a9ea47ca0e0578ca
Wonsik Kim [Tue, 21 Jun 2016 17:35:54 +0000 (17:35 +0000)]
Merge \"DO NOT MERGE omx: check buffer port before using\" into klp-dev
am:
5713902f6a
Change-Id: I8556765a98c6e381548b0b15a90ff08e7281411b
Wonsik Kim [Tue, 21 Jun 2016 17:35:54 +0000 (17:35 +0000)]
DO NOT MERGE omx: check buffer port before using
am:
719fd3c062 -s ours
Change-Id: I7448195d4fd5f32c1b35ca48479473e9c352fef6
Andy Hung [Tue, 21 Jun 2016 17:35:54 +0000 (17:35 +0000)]
Check effect command reply size in AudioFlinger
am:
110bc9547a
Change-Id: I9649715366450333fab28b4f2f1510edde63fb6a
Wonsik Kim [Tue, 21 Jun 2016 17:29:39 +0000 (17:29 +0000)]
Merge "DO NOT MERGE omx: check buffer port before using" into klp-dev
Eino-Ville Talvala [Tue, 21 Jun 2016 00:00:14 +0000 (17:00 -0700)]
DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak
Subtract address of a random static object from pointers being routed
through app process.
Bug:
28466701
Change-Id: Idcbfe81e9507433769672f3dc6d67db5eeed4e04
Eino-Ville Talvala [Tue, 21 Jun 2016 00:00:14 +0000 (17:00 -0700)]
DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak
Subtract address of a random static object from pointers being routed
through app process.
Bug:
28466701
Change-Id: Idcbfe81e9507433769672f3dc6d67db5eeed4e04
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 [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
Andy Hung [Mon, 20 Jun 2016 22:22:52 +0000 (15:22 -0700)]
Check effect command reply size in AudioFlinger
Bug:
29251553
Change-Id: I1bcc1281f1f0542bb645f6358ce31631f2a8ffbf
Marco Nelissen [Fri, 10 Jun 2016 23:34:43 +0000 (23:34 +0000)]
Merge \\\\\\"DO NOT MERGE SoftAAC2: fix crash on all-zero adts buffer\\\\\\" into klp-dev am:
dc7357d201 am:
7e6001b97d am:
fad42aa98d -s ours am:
cf1aed6258 -s ours am:
635dddcdcb
am:
d0244980ba
Change-Id: Ifca0b1e5563e2fa5f1c1e6b35aeb10f7080ace0b
Marco Nelissen [Fri, 10 Jun 2016 23:31:09 +0000 (23:31 +0000)]
Merge \\\\\"DO NOT MERGE SoftAAC2: fix crash on all-zero adts buffer\\\\\" into klp-dev am:
dc7357d201 am:
7e6001b97d am:
fad42aa98d -s ours am:
cf1aed6258 -s ours
am:
635dddcdcb
Change-Id: Id8234d4d1f3e51ac90ab64aba5c2fe268c769dea
Marco Nelissen [Fri, 10 Jun 2016 23:23:40 +0000 (23:23 +0000)]
Merge \\\\"DO NOT MERGE SoftAAC2: fix crash on all-zero adts buffer\\\\" into klp-dev am:
dc7357d201 am:
7e6001b97d am:
fad42aa98d -s ours
am:
cf1aed6258 -s ours
Change-Id: I2e1d024a8753071da5dbe098ea67de782ec44488
Marco Nelissen [Fri, 10 Jun 2016 23:19:51 +0000 (23:19 +0000)]
Merge \\\"DO NOT MERGE SoftAAC2: fix crash on all-zero adts buffer\\\" into klp-dev am:
dc7357d201 am:
7e6001b97d
am:
fad42aa98d -s ours
Change-Id: Ie765e262139491ab9fb60bf81277ba6563d12fa4
Marco Nelissen [Fri, 10 Jun 2016 23:19:48 +0000 (23:19 +0000)]
Merge \\\"SoftAAC2: fix crash on all-zero adts buffer\\\" into lmp-dev am:
5979fb9ea9 am:
6f16bd8a7c
am:
2b10519836
Change-Id: I52e689739e5b2d0d328b8cfcb3dc346d0f6266f4
Marco Nelissen [Fri, 10 Jun 2016 23:16:03 +0000 (23:16 +0000)]
Merge \\"SoftAAC2: fix crash on all-zero adts buffer\\" into lmp-dev am:
5979fb9ea9
am:
6f16bd8a7c
Change-Id: I99797a0404f4999cf1ffb9bc7de8a12e2d2ea842
Marco Nelissen [Fri, 10 Jun 2016 23:16:02 +0000 (23:16 +0000)]
Merge \\"DO NOT MERGE SoftAAC2: fix crash on all-zero adts buffer\\" into klp-dev am:
dc7357d201
am:
7e6001b97d
Change-Id: I405712eeccacfe73708b571dd7242ee9eeb96715
Marco Nelissen [Fri, 10 Jun 2016 23:12:17 +0000 (23:12 +0000)]
Merge \"DO NOT MERGE SoftAAC2: fix crash on all-zero adts buffer\" into klp-dev
am:
dc7357d201
Change-Id: Ib491eb596eca7011d82bf91338d6d56f1275222c
Marco Nelissen [Fri, 10 Jun 2016 23:12:17 +0000 (23:12 +0000)]
Merge \"SoftAAC2: fix crash on all-zero adts buffer\" into lmp-dev
am:
5979fb9ea9
Change-Id: Iec42eb1541358d69a2a541ac65efb4c287486bf9
Marco Nelissen [Fri, 10 Jun 2016 23:02:56 +0000 (23:02 +0000)]
Merge "SoftAAC2: fix crash on all-zero adts buffer" into lmp-dev
Marco Nelissen [Fri, 10 Jun 2016 23:02:40 +0000 (23:02 +0000)]
Merge "DO NOT MERGE SoftAAC2: fix crash on all-zero adts buffer" into klp-dev
Marco Nelissen [Thu, 9 Jun 2016 18:22:00 +0000 (18:22 +0000)]
Merge "Don't use sp<>&" into lmp-mr1-ub-dev
Marco Nelissen [Thu, 9 Jun 2016 17:55:42 +0000 (17:55 +0000)]
Don\\\'t use sp<>& am:
d0f4bfb552 am:
949333a3ab
am:
79d16d19b6 -s ours
Change-Id: I0a179749ccddce6768d797f40bdb7dec561558ce
Marco Nelissen [Tue, 7 Jun 2016 19:26:43 +0000 (12:26 -0700)]
Don't use sp<>&
because they may end up pointing to NULL after a NULL check was performed.
Bug:
28166152
Change-Id: Iab2ea30395b620628cc6f3d067dd4f6fcda824fe
Marco Nelissen [Thu, 9 Jun 2016 17:23:36 +0000 (17:23 +0000)]
Don\\'t use sp<>& am:
d0f4bfb552
am:
949333a3ab
Change-Id: I59c25f65ef687d5cf1d56527cb12b609f7146134
Marco Nelissen [Thu, 9 Jun 2016 17:18:06 +0000 (17:18 +0000)]
Don\'t use sp<>&
am:
d0f4bfb552
Change-Id: I0490c443ad93133a8023134789dcecbcfc159cf3
Marco Nelissen [Thu, 9 Jun 2016 00:14:29 +0000 (00:14 +0000)]
Merge \\\\\\"Don\\\\\\'t use sp<>&\\\\\\" into klp-dev am:
598f8d3218 am:
0ee3710873 am:
e66381758d -s ours am:
33e914c861 am:
803ae13af2
am:
63ef91ddeb
Change-Id: If4a59c7fe516e8456aefda12fb2292c3b3af93da
Marco Nelissen [Thu, 9 Jun 2016 00:11:51 +0000 (00:11 +0000)]
Merge \\\\\"Don\\\\\'t use sp<>&\\\\\" into klp-dev am:
598f8d3218 am:
0ee3710873 am:
e66381758d -s ours am:
33e914c861
am:
803ae13af2
Change-Id: Ic96d6116ceff0cadf0355d8ecead30b4744053c8
Marco Nelissen [Tue, 7 Jun 2016 19:26:43 +0000 (12:26 -0700)]
Don't use sp<>&
because they may end up pointing to NULL after a NULL check was performed.
Bug:
28166152
Change-Id: Iab2ea30395b620628cc6f3d067dd4f6fcda824fe
Marco Nelissen [Thu, 9 Jun 2016 00:09:08 +0000 (00:09 +0000)]
Merge \\\\"Don\\\\'t use sp<>&\\\\" into klp-dev am:
598f8d3218 am:
0ee3710873 am:
e66381758d -s ours
am:
33e914c861
Change-Id: If26c7cf5ce09bc4d92033dbc1ad3b400854a22b3
Marco Nelissen [Thu, 9 Jun 2016 00:06:26 +0000 (00:06 +0000)]
Merge \\\"Don\\\'t use sp<>&\\\" into klp-dev am:
598f8d3218 am:
0ee3710873
am:
e66381758d -s ours
Change-Id: Ie7422768422714cd1c88d2c9c52d7d682157bb4a
Marco Nelissen [Wed, 8 Jun 2016 23:24:47 +0000 (23:24 +0000)]
Fix potential overflow am:
d0090759e7 am:
f5d9360be0 am:
08cb85206a am:
20062e9ea6 am:
999c3ea23b
am:
7f4bf86afd
Change-Id: Ic47ed961eca9156e10e960e912e8b98c5485ebe5
Marco Nelissen [Wed, 8 Jun 2016 23:22:07 +0000 (23:22 +0000)]
Fix potential overflow am:
d0090759e7 am:
f5d9360be0 am:
08cb85206a am:
20062e9ea6
am:
999c3ea23b
Change-Id: I7e93c04f2d43e833cfbc4352d6d4d88198debde0
Marco Nelissen [Wed, 8 Jun 2016 23:19:30 +0000 (23:19 +0000)]
Fix potential overflow am:
d0090759e7 am:
f5d9360be0 am:
08cb85206a
am:
20062e9ea6
Change-Id: I3b1984feedd189530b4cae5719b181aac29fd6ee
Marco Nelissen [Wed, 8 Jun 2016 23:16:48 +0000 (23:16 +0000)]
Fix potential overflow am:
d0090759e7 am:
f5d9360be0
am:
08cb85206a
Change-Id: I200011cb9c9c4a71ec71e856bc3d4dd7fdd971b6
Marco Nelissen [Wed, 8 Jun 2016 23:14:09 +0000 (23:14 +0000)]
Merge \\"Don\\'t use sp<>&\\" into klp-dev am:
598f8d3218
am:
0ee3710873
Change-Id: I95ce93c3c1975b444bd6cd2c49a3b215395d2754
Marco Nelissen [Wed, 8 Jun 2016 23:14:08 +0000 (23:14 +0000)]
Fix potential overflow am:
d0090759e7
am:
f5d9360be0
Change-Id: Ia936e59f80f6a24e449d0aee453956e3be29033a
Marco Nelissen [Wed, 8 Jun 2016 23:11:32 +0000 (23:11 +0000)]
Merge \"Don\'t use sp<>&\" into klp-dev
am:
598f8d3218
Change-Id: I25294fc199e7242dbb2a9700303e713734bbb37d
Marco Nelissen [Wed, 8 Jun 2016 23:11:31 +0000 (23:11 +0000)]
Fix potential overflow
am:
d0090759e7
Change-Id: I261e67806c6e0e6b39cdce99883574024a266c13
Marco Nelissen [Wed, 8 Jun 2016 22:56:35 +0000 (22:56 +0000)]
Merge "Don't use sp<>&" into klp-dev
Marco Nelissen [Wed, 8 Jun 2016 22:00:08 +0000 (15:00 -0700)]
DO NOT MERGE SoftAAC2: fix crash on all-zero adts buffer
Bug:
29153599
Change-Id: Ieb70a90cf31927165de7a840bfdd3ee2c76f4cbd
Marco Nelissen [Wed, 8 Jun 2016 21:31:42 +0000 (14:31 -0700)]
SoftAAC2: fix crash on all-zero adts buffer
Bug:
29153599
Change-Id: I1cb81c054098b86cf24f024f8479909ca7bc85a6
Marco Nelissen [Tue, 7 Jun 2016 22:48:07 +0000 (15:48 -0700)]
Fix potential overflow
Bug:
28533562
Change-Id: I798ab24caa4c81f3ba564cad7c9ee019284fb702
Marco Nelissen [Tue, 7 Jun 2016 19:26:43 +0000 (12:26 -0700)]
Don't use sp<>&
because they may end up pointing to NULL after a NULL check was performed.
Bug:
28166152
Change-Id: Iab2ea30395b620628cc6f3d067dd4f6fcda824fe
Wei Jia [Wed, 25 May 2016 21:26:10 +0000 (21:26 +0000)]
resolve merge conflicts of
823bd74 to lmp-mr1-dev am:
67ca3caf10
am:
6b52fd6b67
* commit '
6b52fd6b673c44afc6fe57e85ef8b6994ea84659':
MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track.
Change-Id: I0e66a037649b0000c90c91b40af6eb587362c00b
Wei Jia [Wed, 25 May 2016 21:20:17 +0000 (21:20 +0000)]
resolve merge conflicts of
823bd74 to lmp-mr1-dev
am:
67ca3caf10
* commit '
67ca3caf10929022b2b742b49a88ff1238d3bbe7':
MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track.
Change-Id: Ib76faa0fc2fd5a854f40b5c31fe7c8bfe0d6e3d6
Wei Jia [Wed, 25 May 2016 21:10:26 +0000 (14:10 -0700)]
resolve merge conflicts of
823bd74 to lmp-mr1-dev
Change-Id: Id8f856591eb2a49bf151a9caa6e15f69e6887e4c
Wei Jia [Wed, 25 May 2016 20:49:45 +0000 (20:49 +0000)]
Merge "MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track." into lmp-dev
Wei Jia [Wed, 25 May 2016 18:58:19 +0000 (18:58 +0000)]
DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track. am:
b016207fc2 am:
e2ca751723 am:
3d1df4f411 -s ours am:
1ed4ec584b -s ours am:
4223af4708
am:
e67ec85275
* commit '
e67ec85275761fc2b8d55e3fb378528052b8fff7':
DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track.
Change-Id: I96fd8075e4d3d379d30f7d269a47b15a1d3b4009
Wei Jia [Wed, 25 May 2016 18:53:57 +0000 (18:53 +0000)]
DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track. am:
b016207fc2 am:
e2ca751723 am:
3d1df4f411 -s ours am:
1ed4ec584b -s ours
am:
4223af4708
* commit '
4223af4708e4524375385efe13f7ddebfd71ffcf':
DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track.
Change-Id: I436f52467a51665718a613ef00ff8ad4899acd72
Wei Jia [Wed, 25 May 2016 18:49:32 +0000 (18:49 +0000)]
DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track. am:
b016207fc2 am:
e2ca751723 am:
3d1df4f411 -s ours
am:
1ed4ec584b -s ours
* commit '
1ed4ec584b736febb95e5fe390bfc1ffea039b99':
DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track.
Change-Id: Ia777e26e03f925fff45db6a4556c05758923a94c
Wei Jia [Wed, 25 May 2016 18:45:07 +0000 (18:45 +0000)]
DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track. am:
b016207fc2 am:
e2ca751723
am:
3d1df4f411 -s ours
* commit '
3d1df4f411a531fb30cc8563cb39e732041d22ad':
DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track.
Change-Id: Id6ce35c59190c3d94129e8ec4c1f2aef108fa71a
Wei Jia [Wed, 25 May 2016 18:37:08 +0000 (18:37 +0000)]
DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track. am:
b016207fc2
am:
e2ca751723
* commit '
e2ca7517232e2df2dc16d358809d7e4723827c42':
DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track.
Change-Id: Ia1dd264fc19f8c82a59a5e2656375f2c2c4403ff
Wei Jia [Wed, 25 May 2016 18:29:43 +0000 (18:29 +0000)]
DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track.
am:
b016207fc2
* commit '
b016207fc2442420e8d3a8633575ffe4fc29fef3':
DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track.
Change-Id: I81cdae1a917cfcd712e800cf3edfd168b1c89c32
Wei Jia [Fri, 28 Aug 2015 17:35:35 +0000 (10:35 -0700)]
MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track.
GenericSource: return error when no track exists.
SampleIterator: make sure mSamplesPerChunk is not zero before using it as divisor.
Bug:
21657957
Bug:
23705695
Bug:
22802344
Bug:
28799341
Change-Id: I7664992ade90b935d3f255dcd43ecc2898f30b04
(cherry picked from commit
0386c91b8a910a134e5898ffa924c1b6c7560b13)
Wei Jia [Fri, 28 Aug 2015 17:35:35 +0000 (10:35 -0700)]
DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track.
GenericSource: return error when no track exists.
SampleIterator: make sure mSamplesPerChunk is not zero before using it as divisor.
Bug:
21657957
Bug:
23705695
Bug:
22802344
Bug:
28799341
Change-Id: I7664992ade90b935d3f255dcd43ecc2898f30b04
(cherry picked from commit
0386c91b8a910a134e5898ffa924c1b6c7560b13)
Marco Nelissen [Mon, 23 May 2016 23:07:11 +0000 (23:07 +0000)]
Merge "DO NOT MERGE limit mediaserver memory" into klp-dev am:
f8429c0c14 am:
38ab87c3e3 am:
e816dcc0b3 -s ours am:
cbe776167a -s ours am:
61a1371ea1
am:
1094b530ad
* commit '
1094b530ad2189ab879ef0bc20bae820b3d12c86':
DO NOT MERGE limit mediaserver memory
Change-Id: I65c6ecb4787ab13560686b47b2cd970c54bd1118
Marco Nelissen [Mon, 23 May 2016 23:02:59 +0000 (23:02 +0000)]
Merge "DO NOT MERGE limit mediaserver memory" into klp-dev am:
f8429c0c14 am:
38ab87c3e3 am:
e816dcc0b3 -s ours am:
cbe776167a -s ours
am:
61a1371ea1
* commit '
61a1371ea195495c4bf2fe30812cce9275674c08':
DO NOT MERGE limit mediaserver memory
Change-Id: I8939080db97ba4a7bfc6d858ec6d6bc1e8296868
Marco Nelissen [Mon, 23 May 2016 22:58:51 +0000 (22:58 +0000)]
Merge "limit mediaserver memory" into lmp-dev am:
41e0a503e6 am:
76f9ec33f0
am:
57dc6d9dce
* commit '
57dc6d9dce0bbafa442fda41f98da858b89c5059':
limit mediaserver memory
Change-Id: Id57767343c25b32bf523ac1c5f421f2f38fb68ad
Marco Nelissen [Mon, 23 May 2016 22:58:50 +0000 (22:58 +0000)]
Merge "DO NOT MERGE limit mediaserver memory" into klp-dev am:
f8429c0c14 am:
38ab87c3e3 am:
e816dcc0b3 -s ours
am:
cbe776167a -s ours
* commit '
cbe776167a52a43f6acbafd3278e662840a256c2':
DO NOT MERGE limit mediaserver memory
Change-Id: I271600c88d36fc23ecfaea51d6fc22f39546ea9f
Marco Nelissen [Mon, 23 May 2016 22:54:45 +0000 (22:54 +0000)]
Merge "DO NOT MERGE limit mediaserver memory" into klp-dev am:
f8429c0c14 am:
38ab87c3e3
am:
e816dcc0b3 -s ours
* commit '
e816dcc0b3ea6d5cee3b0b4ff230a20ab85b5996':
DO NOT MERGE limit mediaserver memory
Change-Id: Ia2bb13dbcbe30984d86c1a625ded2db5ddbbca2d
Marco Nelissen [Mon, 23 May 2016 22:54:44 +0000 (22:54 +0000)]
Merge "limit mediaserver memory" into lmp-dev am:
41e0a503e6
am:
76f9ec33f0
* commit '
76f9ec33f0e0ac80904b1cebe50b5d2bb3ccaf07':
limit mediaserver memory
Change-Id: Ib771b5daec2ce2dd981193b1425002f8bc7db2e7
Marco Nelissen [Mon, 23 May 2016 22:50:37 +0000 (22:50 +0000)]
Merge "DO NOT MERGE limit mediaserver memory" into klp-dev am:
f8429c0c14
am:
38ab87c3e3
* commit '
38ab87c3e3cd4868958fcec4d1591ebc4a9e8d1a':
DO NOT MERGE limit mediaserver memory
Change-Id: I053031830618e20ff830ae3c097abba10ae73cfc
Marco Nelissen [Mon, 23 May 2016 22:46:25 +0000 (22:46 +0000)]
Merge "limit mediaserver memory" into lmp-dev
am:
41e0a503e6
* commit '
41e0a503e6f0c124208a7b9a8fa7321656359407':
limit mediaserver memory
Change-Id: I95f77a8d40bd8e7fcd5a0dfae71d29809a3e62cc
Marco Nelissen [Mon, 23 May 2016 22:46:23 +0000 (22:46 +0000)]
Merge "DO NOT MERGE limit mediaserver memory" into klp-dev
am:
f8429c0c14
* commit '
f8429c0c147b081ff6f06f55f8fa2f36fc60063e':
DO NOT MERGE limit mediaserver memory
Change-Id: Ia88648ff82be88a90c98ded3061a6f04db74c03b
Marco Nelissen [Mon, 23 May 2016 22:36:20 +0000 (22:36 +0000)]
Merge "limit mediaserver memory" into lmp-dev
Marco Nelissen [Mon, 23 May 2016 22:35:11 +0000 (22:35 +0000)]
Merge "DO NOT MERGE limit mediaserver memory" into klp-dev
Marco Nelissen [Fri, 13 May 2016 17:43:19 +0000 (10:43 -0700)]
DO NOT MERGE limit mediaserver memory
Limit mediaserver using rlimit, to prevent it from bringing down the system
via the low memory killer.
Default max is 65% of total RAM, but can be customized via system property.
Bug:
28471206
Bug:
28615448
Change-Id: I14fac1e12b5f3983be08a21bfbfc54feedbf3f16
Marco Nelissen [Mon, 23 May 2016 14:52:11 +0000 (14:52 +0000)]
Merge "DO NOT MERGE Check malloc result to avoid NPD" into klp-dev am:
fddbb1a791 am:
9897bd43a6 am:
8fd8bfdfbd -s ours am:
748277a992 -s ours am:
71b3486ba6
am:
f55cac801a
* commit '
f55cac801a7678b58d16196b42d8110f67684024':
DO NOT MERGE Check malloc result to avoid NPD
Change-Id: I0b79d04edda6a674bc2531a713d128485619e65b
Marco Nelissen [Mon, 23 May 2016 14:49:20 +0000 (14:49 +0000)]
Merge "Check malloc result to avoid NPD" into lmp-dev am:
e5734d88ad am:
f6e3609de2
am:
6d1da7d539
* commit '
6d1da7d53995c1a171eedc99bd9b17d8dfe3d158':
Check malloc result to avoid NPD
Change-Id: I92303d3c07ff920a4c7e2d1a94bd341102035ba1
OSDN Git Service
