OSDN Git Service
Ray Essick [Wed, 9 Nov 2016 18:33:12 +0000 (18:33 +0000)]
DO NOT MERGE: defensive parsing of mp3 album art information am:
2ff80538b7 am:
c3819cfda9
am:
c696d76d98 -s ours
Change-Id: I80f50a474af40a2ea3c732604e77caef6afadf46
Ray Essick [Wed, 9 Nov 2016 18:27:11 +0000 (18:27 +0000)]
DO NOT MERGE: defensive parsing of mp3 album art information am:
2ff80538b7
am:
c3819cfda9
Change-Id: I2a98a164f3c1d728e0f5bec906116cd1bffac19a
Ray Essick [Wed, 9 Nov 2016 18:21:12 +0000 (18:21 +0000)]
DO NOT MERGE: defensive parsing of mp3 album art information
am:
2ff80538b7
Change-Id: I864307c871b8ab48fd0fe2ddaba2e6ead0f0233a
Ray Essick [Wed, 2 Nov 2016 21:16:28 +0000 (14:16 -0700)]
DO NOT MERGE: defensive parsing of mp3 album art information
several points in stagefrights mp3 album art code
used strlen() to parse user-supplied strings that may be
unterminated, resulting in reading beyond the end of a buffer.
This changes the code to use strnlen() for 8-bit encodings and
strengthens the parsing of 16-bit encodings similarly. It also
reworks how we watch for the end-of-buffer to avoid all over-reads.
Bug:
32377688
Test: crafted mp3's w/ good/bad cover art. See what showed in play music
Change-Id: I479d51e88d3180461cb6ea5540974671cfd84201
Ray Essick [Wed, 2 Nov 2016 21:15:43 +0000 (14:15 -0700)]
DO NOT MERGE: defensive parsing of mp3 album art information
several points in stagefrights mp3 album art code
used strlen() to parse user-supplied strings that may be
unterminated, resulting in reading beyond the end of a buffer.
This changes the code to use strnlen() for 8-bit encodings and
strengthens the parsing of 16-bit encodings similarly. It also
reworks how we watch for the end-of-buffer to avoid all over-reads.
Bug:
32377688
Test: crafted mp3's w/ good/bad cover art. See what showed in play music
Change-Id: Idbaf221fa2283b33e83f399562a3323dd095cc2c
Marco Nelissen [Fri, 14 Oct 2016 22:02:31 +0000 (22:02 +0000)]
Merge "Fix divide by zero" into lmp-dev
Marco Nelissen [Thu, 13 Oct 2016 23:30:30 +0000 (23:30 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into klp-dev am:
2c28e5b126 am:
a5477b11be
am:
913b7564c4 -s ours
Change-Id: I9698f264d5285632c8f7f7d83726da35499f290e
Marco Nelissen [Thu, 13 Oct 2016 23:30:16 +0000 (23:30 +0000)]
DO NOT MERGE Fix divide by zero am:
febbd52cd9 am:
55ce7e5d1e
am:
1b3f61ceaf -s ours
Change-Id: Iaf8f9526bbb01eca75ded491f2dd43baabaee22e
Marco Nelissen [Thu, 13 Oct 2016 23:28:29 +0000 (23:28 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into klp-dev am:
2c28e5b126
am:
a5477b11be
Change-Id: I23bc38094b99e0563a4aeeb7df08631212d0b73a
Marco Nelissen [Thu, 13 Oct 2016 23:28:17 +0000 (23:28 +0000)]
DO NOT MERGE Fix divide by zero am:
febbd52cd9
am:
55ce7e5d1e
Change-Id: I792667b35aacfa1b910a332d855f002615041408
Marco Nelissen [Thu, 13 Oct 2016 23:25:47 +0000 (23:25 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into klp-dev
am:
2c28e5b126
Change-Id: Ic69824aeaf760eb6b5e79fef78be41c2cb4d749e
Marco Nelissen [Thu, 13 Oct 2016 23:25:47 +0000 (23:25 +0000)]
DO NOT MERGE Fix divide by zero
am:
febbd52cd9
Change-Id: I229ab9fee73b63493c4e61493de6183857ef886a
Marco Nelissen [Thu, 6 Oct 2016 22:31:52 +0000 (15:31 -0700)]
Fix divide by zero
and be stricter about the layout of various boxes in mp4 files.
Bug:
31318219
Change-Id: I50034d5b6b1967ca6e88aabeacf49f26ba3c0d32
Marco Nelissen [Thu, 13 Oct 2016 23:19:54 +0000 (23:19 +0000)]
Merge "DO NOT MERGE Fix divide by zero" into klp-dev
Ricardo Garcia [Thu, 13 Oct 2016 01:33:30 +0000 (01:33 +0000)]
Merge "Fix potential NULL dereference in Visualizer effect" into klp-dev am:
eee86b009e am:
6732f45ee9
am:
24566f2939
Change-Id: Ibfc04cf102256f0a114b9670550beee44254be14
rago [Thu, 13 Oct 2016 01:33:18 +0000 (01:33 +0000)]
Fix potential NULL dereference in Visualizer effect am:
874f9e0b8e am:
f060479b9a
am:
bcc7230bb9
Change-Id: If5d6fefb276341472d827bac3f349561f7d1d990
Ricardo Garcia [Thu, 13 Oct 2016 01:26:59 +0000 (01:26 +0000)]
Merge "Fix potential NULL dereference in Visualizer effect" into klp-dev am:
eee86b009e
am:
6732f45ee9
Change-Id: Ic59a0ab61486e1a420988653e4276b3f5e660729
rago [Thu, 13 Oct 2016 01:26:47 +0000 (01:26 +0000)]
Fix potential NULL dereference in Visualizer effect am:
874f9e0b8e
am:
f060479b9a
Change-Id: I69eb3819f246e6d807af099f9a0260146cd06fd2
Ricardo Garcia [Thu, 13 Oct 2016 01:19:49 +0000 (01:19 +0000)]
Merge "Fix potential NULL dereference in Visualizer effect" into klp-dev
am:
eee86b009e
Change-Id: Id6c3168ccbf272646f123090ab4fadab34b0f728
rago [Thu, 13 Oct 2016 01:19:48 +0000 (01:19 +0000)]
Fix potential NULL dereference in Visualizer effect
am:
874f9e0b8e
Change-Id: I382b8cc3799b52e085aac0ccec7dcb668a4933ec
Ricardo Garcia [Thu, 13 Oct 2016 01:13:46 +0000 (01:13 +0000)]
Merge "Fix potential NULL dereference in Visualizer effect" into klp-dev
Pawin Vongmasa [Thu, 13 Oct 2016 01:12:59 +0000 (01:12 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into klp-dev am:
8caef85235 am:
b512f4ab42
am:
d18d8fac61 -s ours
Change-Id: I4b99c669b012bde7631699d5e7ef0da874cc14d4
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:30 +0000 (01:06 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into klp-dev am:
8caef85235
am:
b512f4ab42
Change-Id: Ic852128c935782783fc03175be9968da6e894e90
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 klp-dev
am:
8caef85235
Change-Id: I9b4b155c4a720b27120428ea995833c426a65fef
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:47:49 +0000 (00:47 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into lmp-dev
Pawin Vongmasa [Thu, 13 Oct 2016 00:47:33 +0000 (00:47 +0000)]
Merge "DO NOT MERGE - MPEG4Extractor: Check mLastTrack before dereferencing." into klp-dev
rago [Sat, 8 Oct 2016 01:16:09 +0000 (18:16 -0700)]
Fix potential NULL dereference in Visualizer effect
Bug:
30229821
Test: fixing CL. Existing unit tests still pass.
Change-Id: I6e4abd759d5d2abc3b391e92e2e18f060cab7af0
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
Marco Nelissen [Thu, 6 Oct 2016 22:31:52 +0000 (15:31 -0700)]
DO NOT MERGE Fix divide by zero
and be stricter about the layout of various boxes in mp4 files.
Bug:
31318219
Change-Id: I50034d5b6b1967ca6e88aabeacf49f26ba3c0d32
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
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 [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: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: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 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: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:04:34 +0000 (23:04 +0000)]
Merge "SoundTrigger: get service by value." into lmp-dev
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: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: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: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:52:06 +0000 (16:52 +0000)]
Merge "DO NOT MERGE: IOMX: work against metadata buffer spoofing" into klp-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
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
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
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)
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