OSDN Git Service
Pawin Vongmasa [Thu, 13 Oct 2016 01:26:48 +0000 (01:26 +0000)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. am:
de84a76b86 am:
2c76c56d56 am:
f1e84ca858 -s ours am:
7b9756261d -s ours
am:
d676f1bfeb
Change-Id: I0f8ec51bbc0e26aae780f20668f5ac03d5a8da42
Pawin Vongmasa [Thu, 13 Oct 2016 01:19:47 +0000 (01:19 +0000)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. am:
de84a76b86 am:
2c76c56d56 am:
f1e84ca858 -s ours
am:
7b9756261d -s ours
Change-Id: I016c0378320af03c05a01059de8c6edeabd84130
Pawin Vongmasa [Thu, 13 Oct 2016 01:12:46 +0000 (01:12 +0000)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. am:
de84a76b86 am:
2c76c56d56
am:
f1e84ca858 -s ours
Change-Id: I7b0abee027d5cc3e697b3afcbf8412641f963ad3
Pawin Vongmasa [Thu, 13 Oct 2016 01:06:29 +0000 (01:06 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into lmp-dev am:
b6ba3d7e47 -s ours
am:
37e3ea354a
Change-Id: Ica84145fb5bba2067aeaa3311d66395aea25e860
Pawin Vongmasa [Thu, 13 Oct 2016 01:06:17 +0000 (01:06 +0000)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. am:
0338b14e28 -s ours
am:
648b682eeb
Change-Id: I8a304efd3e38c9b3a5f1d6c507250bf7ce26319a
Pawin Vongmasa [Thu, 13 Oct 2016 01:06:16 +0000 (01:06 +0000)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing. am:
de84a76b86
am:
2c76c56d56
Change-Id: I24c8963da1f34e724213bbb896722a06d1eca378
Pawin Vongmasa [Thu, 13 Oct 2016 00:59:47 +0000 (00:59 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into lmp-dev
am:
b6ba3d7e47 -s ours
Change-Id: Iab547a3c17869e99ec58022b11a27eeb2777c729
Pawin Vongmasa [Thu, 13 Oct 2016 00:59:46 +0000 (00:59 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into lmp-mr1-dev
am:
622fd04e88
Change-Id: I9a6424ca1f7724e5513e0251f650382b3a49f1f7
Pawin Vongmasa [Thu, 13 Oct 2016 00:59:46 +0000 (00:59 +0000)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing.
am:
0338b14e28 -s ours
Change-Id: Idc7eaeacd94e4499b75aaa1213bf6848ae9206c1
Pawin Vongmasa [Thu, 13 Oct 2016 00:59:46 +0000 (00:59 +0000)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing.
am:
de84a76b86
Change-Id: I7bfde467167616b191ac1d75f3ea08f1ba78089b
Pawin Vongmasa [Thu, 13 Oct 2016 00:59:45 +0000 (00:59 +0000)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing.
am:
25d34cacde
Change-Id: I92443c3bee4174f9c6d493911d84d022dbb1972f
Pawin Vongmasa [Thu, 13 Oct 2016 00:47:52 +0000 (00:47 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into lmp-mr1-dev
Pawin Vongmasa [Thu, 13 Oct 2016 00:47:49 +0000 (00:47 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into lmp-dev
Lajos Molnar [Tue, 11 Oct 2016 23:16:13 +0000 (23:16 +0000)]
stagefright: don't fail MediaCodec.configure if clients use store-meta key am:
afb20c3102 am:
d9f6b22189 am:
1c44a2ed66 am:
efe63962a7
am:
6616cf9e18
Change-Id: If2b68293e43057d517989755f64e56bdfab20b8e
Lajos Molnar [Tue, 11 Oct 2016 23:10:12 +0000 (23:10 +0000)]
stagefright: don't fail MediaCodec.configure if clients use store-meta key am:
afb20c3102 am:
d9f6b22189 am:
1c44a2ed66
am:
efe63962a7
Change-Id: Id22c6f78db4d457c281ab9db7c214236c2bdb18d
Lajos Molnar [Tue, 11 Oct 2016 23:04:42 +0000 (23:04 +0000)]
stagefright: don't fail MediaCodec.configure if clients use store-meta key am:
afb20c3102 am:
d9f6b22189
am:
1c44a2ed66
Change-Id: I5ef2909336c4264e22c4216b64fccc46ea654c19
Lajos Molnar [Tue, 11 Oct 2016 22:58:40 +0000 (22:58 +0000)]
stagefright: don't fail MediaCodec.configure if clients use store-meta key am:
afb20c3102
am:
d9f6b22189
Change-Id: If02cd075a28e4b96fa1c311547a8837d67e848d5
Lajos Molnar [Tue, 11 Oct 2016 22:53:10 +0000 (22:53 +0000)]
stagefright: don't fail MediaCodec.configure if clients use store-meta key
am:
afb20c3102
Change-Id: Ia68b31d3e1781cb24e0c16f669a6b26644f33d46
Lajos Molnar [Tue, 11 Oct 2016 15:41:51 +0000 (08:41 -0700)]
stagefright: don't fail MediaCodec.configure if clients use store-meta key
Even though storing metadata is not supported in MediaCodec.configure and
is only meant to be used by Stagefright recorder, don't fail configure.
Bug:
31986922
Change-Id: Id9f083be6e857e7a0d8d4a74159be5b8894e28be
Pawin Vongmasa [Fri, 30 Sep 2016 07:45:52 +0000 (00:45 -0700)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing.
Bug:
31449945
Change-Id: If2708b3006c22393e80a2557f93d8a71e4e7bf16
Pawin Vongmasa [Fri, 30 Sep 2016 09:44:54 +0000 (02:44 -0700)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing.
Bug:
31449945
Change-Id: Icc5714bd2459c053c0a913b1c27d9ffbef5b2d2a
Pawin Vongmasa [Fri, 30 Sep 2016 09:29:29 +0000 (02:29 -0700)]
DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing.
Bug:
31449945
Change-Id: I7fd0bb683819b2e43863b861fb078a6a67fa5317
Robert Shih [Thu, 22 Sep 2016 04:39:05 +0000 (04:39 +0000)]
Merge "SampleIterator: clear members on seekTo error" into klp-dev am:
610a9222d6 am:
a78bd18c93 am:
9578341c41 am:
8ede96a5f2
am:
f7a2861c08
Change-Id: Ic6e50bef5ab391402178a6f81695a9570b948497
Robert Shih [Thu, 22 Sep 2016 04:38:49 +0000 (04:38 +0000)]
SampleIterator: clear members on seekTo error am:
03237ce0f9 am:
8468b8980c am:
e0d588b892 am:
d4ddd555f1
am:
f72b9e0011
Change-Id: Id75a548e9ca949e760f1e642283fcd27e57dd2dd
Robert Shih [Thu, 22 Sep 2016 03:12:21 +0000 (03:12 +0000)]
Merge "SampleIterator: clear members on seekTo error" into klp-dev am:
610a9222d6 am:
a78bd18c93 am:
9578341c41
am:
8ede96a5f2
Change-Id: I48772c14585f8f90012321a9f16d57c09338811b
Robert Shih [Thu, 22 Sep 2016 03:12:07 +0000 (03:12 +0000)]
SampleIterator: clear members on seekTo error am:
03237ce0f9 am:
8468b8980c am:
e0d588b892
am:
d4ddd555f1
Change-Id: I08b5684d546c10a0bc1bd47e74528f9ec7819003
Robert Shih [Thu, 22 Sep 2016 03:07:42 +0000 (03:07 +0000)]
Merge "SampleIterator: clear members on seekTo error" into klp-dev am:
610a9222d6 am:
a78bd18c93
am:
9578341c41
Change-Id: Ia3bdadd25c957b6a5e3a1a7fe0e5e414ff510721
Robert Shih [Thu, 22 Sep 2016 03:07:28 +0000 (03:07 +0000)]
SampleIterator: clear members on seekTo error am:
03237ce0f9 am:
8468b8980c
am:
e0d588b892
Change-Id: I62d47aa490a6fb62eabd5f80da26e47de69b8b1c
Robert Shih [Thu, 22 Sep 2016 00:43:10 +0000 (00:43 +0000)]
Merge "SampleIterator: clear members on seekTo error" into klp-dev am:
610a9222d6
am:
a78bd18c93
Change-Id: Iec88e35a497a7503b589739082b86ae5bc0e2479
Robert Shih [Thu, 22 Sep 2016 00:42:56 +0000 (00:42 +0000)]
SampleIterator: clear members on seekTo error am:
03237ce0f9
am:
8468b8980c
Change-Id: I4d81b7bd8732f03d0308740b96418203d17cd65b
Robert Shih [Thu, 22 Sep 2016 00:36:56 +0000 (00:36 +0000)]
Merge "SampleIterator: clear members on seekTo error" into klp-dev
am:
610a9222d6
Change-Id: I39efc9f85b13cb1212565b58f8907fd53b31920c
Robert Shih [Thu, 22 Sep 2016 00:36:55 +0000 (00:36 +0000)]
SampleIterator: clear members on seekTo error
am:
03237ce0f9
Change-Id: I0dd1251bd8f132b445ebf515e4555e9ec9953269
Robert Shih [Thu, 22 Sep 2016 00:25:48 +0000 (00:25 +0000)]
Merge "SampleIterator: clear members on seekTo error" into klp-dev
Marco Nelissen [Wed, 21 Sep 2016 21:58:19 +0000 (21:58 +0000)]
Limit mp4 atom size to something reasonable am:
cb898dca47
am:
3a8c303038
Change-Id: I7907117a622513ea8f1cc5d198e056778ddc3e50
Marco Nelissen [Wed, 21 Sep 2016 21:55:16 +0000 (21:55 +0000)]
Limit mp4 atom size to something reasonable
am:
cb898dca47
Change-Id: I4aedbf522dfabefbe797d37e3a37160c8f210e90
Marco Nelissen [Mon, 19 Sep 2016 23:22:56 +0000 (16:22 -0700)]
Limit mp4 atom size to something reasonable
Bug:
28615448
Change-Id: I5916f6839b4a9bbee4388a106e7373bcd4154f5a
Marco Nelissen [Wed, 21 Sep 2016 20:56:47 +0000 (20:56 +0000)]
Merge "Limit mp4 atom size to something reasonable" into klp-dev am:
9af51c59dc am:
3fb9e5b7cb am:
085a4173eb am:
b617cbed2d
am:
f5b8755f18
Change-Id: I0580baa791fa7f87f5e65a47bff20cf1d44334c2
Marco Nelissen [Wed, 21 Sep 2016 20:56:34 +0000 (20:56 +0000)]
Limit mp4 atom size to something reasonable am:
638c99bad6 am:
569f3db605 am:
29ccd8c55d -s ours am:
03bee1989e
am:
6c6dd8d9a5
Change-Id: I60b8d9c769c814b67a636ea8f2f3b451c548f7f6
Marco Nelissen [Wed, 21 Sep 2016 20:54:21 +0000 (20:54 +0000)]
Merge "Limit mp4 atom size to something reasonable" into klp-dev am:
9af51c59dc am:
3fb9e5b7cb am:
085a4173eb
am:
b617cbed2d
Change-Id: Ia289fe9f51200867d38ad92821db2b48532e62e9
Marco Nelissen [Wed, 21 Sep 2016 20:54:04 +0000 (20:54 +0000)]
Limit mp4 atom size to something reasonable am:
638c99bad6 am:
569f3db605 am:
29ccd8c55d -s ours
am:
03bee1989e
Change-Id: I9ebff4e3cb7adace3949c550a74d072c53a18a27
Marco Nelissen [Wed, 21 Sep 2016 20:52:08 +0000 (20:52 +0000)]
Merge "Limit mp4 atom size to something reasonable" into klp-dev am:
9af51c59dc am:
3fb9e5b7cb
am:
085a4173eb
Change-Id: I0727b58843540b89c4e4668c1e7f2168d5fc7058
Marco Nelissen [Wed, 21 Sep 2016 20:51:33 +0000 (20:51 +0000)]
Limit mp4 atom size to something reasonable am:
638c99bad6 am:
569f3db605
am:
29ccd8c55d -s ours
Change-Id: If514b12f86a85a90ff0835eeafa5a31324ec3c17
Marco Nelissen [Wed, 21 Sep 2016 20:41:43 +0000 (20:41 +0000)]
Merge "Limit mp4 atom size to something reasonable" into klp-dev am:
9af51c59dc
am:
3fb9e5b7cb
Change-Id: Ibcb0e44db0ff0da658af399522266606171b6a2e
Marco Nelissen [Wed, 21 Sep 2016 20:41:31 +0000 (20:41 +0000)]
Limit mp4 atom size to something reasonable am:
638c99bad6
am:
569f3db605
Change-Id: Icc063dd70e08fea6320e3d3f64ebbd4ba51d8aa8
Marco Nelissen [Wed, 21 Sep 2016 20:39:01 +0000 (20:39 +0000)]
Merge "Limit mp4 atom size to something reasonable" into klp-dev
am:
9af51c59dc
Change-Id: Id16a06b7ec4fceac9ecec7ed3504fdf233095268
Marco Nelissen [Wed, 21 Sep 2016 20:39:01 +0000 (20:39 +0000)]
Limit mp4 atom size to something reasonable
am:
638c99bad6
Change-Id: I1284a0b7a44c5f7a8d88b931114e201d8cb09601
Marco Nelissen [Wed, 21 Sep 2016 20:35:16 +0000 (20:35 +0000)]
Merge "Limit mp4 atom size to something reasonable" into klp-dev
Marco Nelissen [Mon, 19 Sep 2016 23:22:56 +0000 (16:22 -0700)]
Limit mp4 atom size to something reasonable
Bug:
28615448
Change-Id: I5916f6839b4a9bbee4388a106e7373bcd4154f5a
Marco Nelissen [Wed, 21 Sep 2016 14:49:00 +0000 (14:49 +0000)]
Check mprotect result am:
866c800c06 am:
a0cfcf38d4 am:
638aca47be am:
e353ce4b3c
am:
762b7a9b6e
Change-Id: I63e5846c6a21f03c9063c3d48e49dfe48fb22ea7
Marco Nelissen [Wed, 21 Sep 2016 14:46:30 +0000 (14:46 +0000)]
Check mprotect result am:
866c800c06 am:
a0cfcf38d4 am:
638aca47be
am:
e353ce4b3c
Change-Id: Iba3ac429600319f099276cc774eb8b3bb85e7b25
Marco Nelissen [Wed, 21 Sep 2016 14:44:02 +0000 (14:44 +0000)]
Check mprotect result am:
866c800c06 am:
a0cfcf38d4
am:
638aca47be
Change-Id: I337dd1d62a4cd52de051afd4d9b919a742ad20fe
Marco Nelissen [Wed, 21 Sep 2016 14:41:28 +0000 (14:41 +0000)]
Check mprotect result am:
866c800c06
am:
a0cfcf38d4
Change-Id: I0f188e2c717922689df42af21f6c47a865a8c390
Marco Nelissen [Wed, 21 Sep 2016 14:38:58 +0000 (14:38 +0000)]
Check mprotect result
am:
866c800c06
Change-Id: I7b20d72aafb9a95480c1a6b16f0cafc4d1749470
Robert Shih [Wed, 21 Sep 2016 00:37:55 +0000 (17:37 -0700)]
SampleIterator: clear members on seekTo error
Bug:
31091777
Change-Id: Iddf99d0011961d0fd3d755e57db4365b6a6a1193
Marco Nelissen [Tue, 20 Sep 2016 20:36:40 +0000 (13:36 -0700)]
Check mprotect result
mprotect can theoretically fail, which could then let one exploit
a vulnerable codec if one exists on the device.
Bug:
31350239
Change-Id: I7b99c190619f0fb2eb93119596e6da0d2deb8ba5
Ricardo Garcia [Tue, 20 Sep 2016 01:27:53 +0000 (01:27 +0000)]
Merge "Fix potential overflow in Visualizer effect" into klp-dev am:
b602286952 am:
f59ab362c5 am:
d7822b3313 am:
9a5ec6b4c3
am:
d959eb23c5
Change-Id: I9607061992408699810ee2e3da764b249fee5cf1
rago [Tue, 20 Sep 2016 01:27:39 +0000 (01:27 +0000)]
Fix potential overflow in Visualizer effect am:
46dc714d52 am:
8720f85196 am:
bad0250dcb am:
2feb9ce748
am:
fba2bd1372
Change-Id: Ic9b0c82b5fa96866efe440d28ba5226c12fa6af1
Chong Zhang [Tue, 20 Sep 2016 01:27:13 +0000 (01:27 +0000)]
IOMX: do not clear buffer if it's allocated by component am:
ea76573aa2 am:
86d9bb9141 am:
dfe5b5193c am:
b308b1a5d9
am:
87415a74ee
Change-Id: If59c75fcee406abe3a2afb1c3e601f7f4b5f8970
Ricardo Garcia [Tue, 20 Sep 2016 00:57:01 +0000 (00:57 +0000)]
Merge "Fix potential overflow in Visualizer effect" into klp-dev am:
b602286952 am:
f59ab362c5 am:
d7822b3313
am:
9a5ec6b4c3
Change-Id: I9567b9e3dbd3107cb64ae96681fec0ebb775190f
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
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
Ricardo Garcia [Tue, 20 Sep 2016 00:46:09 +0000 (00:46 +0000)]
Merge "Fix potential overflow in Visualizer effect" into klp-dev am:
b602286952 am:
f59ab362c5
am:
d7822b3313
Change-Id: Iec66f66b4239b395253d757d57725ecd20320c13
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
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
Ricardo Garcia [Tue, 20 Sep 2016 00:39:45 +0000 (00:39 +0000)]
Merge "Fix potential overflow in Visualizer effect" into klp-dev am:
b602286952
am:
f59ab362c5
Change-Id: I9b65bbed0946bb25b25772f24256dbe1f8fe022c
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
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
Ricardo Garcia [Tue, 20 Sep 2016 00:35:07 +0000 (00:35 +0000)]
Merge "Fix potential overflow in Visualizer effect" into klp-dev
am:
b602286952
Change-Id: Ic0cd9c82a5417e0281db38d806956876d95801fc
rago [Tue, 20 Sep 2016 00:35:04 +0000 (00:35 +0000)]
Fix potential overflow in Visualizer effect
am:
46dc714d52
Change-Id: I61f5adb793d2c54c078211213b25fd7ea37a3895
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
Ricardo Garcia [Tue, 20 Sep 2016 00:27:26 +0000 (00:27 +0000)]
Merge "Fix potential overflow in Visualizer effect" into klp-dev
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
Lajos Molnar [Thu, 15 Sep 2016 22:46:54 +0000 (22:46 +0000)]
IOMX: allow configuration after going to loaded state am:
c13904014b am:
99accf6cdc am:
9a565c52b0 am:
daa3b8e3fa
am:
c47a0e4c71
Change-Id: I25b1252b6165bb815d6713ca3bce6a17dffdd640
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
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
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
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
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
Eric Laurent [Tue, 13 Sep 2016 23:16:41 +0000 (23:16 +0000)]
Merge "SoundTrigger: get service by value." into lmp-dev am:
d9288b85b3
am:
1382a3a869
Change-Id: Iff9cdece93d788ec081e95d68b0470dd42d338ab
Eric Laurent [Tue, 13 Sep 2016 23:16:40 +0000 (23:16 +0000)]
SoundTrigger: get service by value. am:
3b01b3019b
am:
bd33d5672f
Change-Id: I02848bd715ac17b90728d867242889749ff39f61
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
Eric Laurent [Tue, 13 Sep 2016 23:13:40 +0000 (23:13 +0000)]
SoundTrigger: get service by value.
am:
3b01b3019b
Change-Id: Ibb98c945e51fef6d21e91b1e9f670eb4f83c5663
Eric Laurent [Tue, 13 Sep 2016 23:04:34 +0000 (23:04 +0000)]
Merge "SoundTrigger: get service by value." into lmp-dev
Lajos Molnar [Fri, 9 Sep 2016 17:08:18 +0000 (17:08 +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
am:
4636e7256a
Change-Id: I8785b7aaee1c5d7b5061faa32c2b86b9f34f2339
Lajos Molnar [Fri, 9 Sep 2016 17:08:17 +0000 (17:08 +0000)]
DO NOT MERGE: IOMX: work against metadata buffer spoofing am:
807e827d4c am:
ee9effab3d am:
c5251a627c -s ours am:
18f84821f6 -s ours
am:
a6d4a2a14c
Change-Id: I5d20ea6b5fbbf2b1e3fb698a6f9ada8361b38f73
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
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
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
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
Lajos Molnar [Fri, 9 Sep 2016 17:00:32 +0000 (17:00 +0000)]
Merge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into lmp-dev am:
6981afc6ac -s ours
am:
efd392db1d
Change-Id: I8281b233acd6ff226964b7d8b9a5702cf74d18cd
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
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
Lajos Molnar [Fri, 9 Sep 2016 16:59:45 +0000 (16:59 +0000)]
DO NOT MERGE: IOMX: work against metadata buffer spoofing am:
86369364a0 -s ours
am:
97f82679d8
Change-Id: I135260d20085f49a9dd3dafd83d76e4408a8f33e
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
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
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
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
Lajos Molnar [Fri, 9 Sep 2016 16:54:43 +0000 (16:54 +0000)]
Merge changes I801c77b8,I3d5bad4a into lmp-mr1-dev
am:
7c36c95b19
Change-Id: I6b2c80df71e7b131ada618141db3cdec37d9e587
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