OSDN Git Service
Wei Jia [Mon, 17 Aug 2015 20:59:03 +0000 (20:59 +0000)]
Merge "libstagefright: fix possible overflow in SampleTable.cpp" into mnc-dev
Wei Jia [Fri, 14 Aug 2015 21:45:32 +0000 (14:45 -0700)]
libstagefright: fix possible overflow in SampleTable.cpp
Bug:
23197952
Change-Id: I83afe5aad74a41102b127c4e46799ebc317cd96c
Wei Jia [Mon, 17 Aug 2015 00:41:50 +0000 (17:41 -0700)]
libstagefright: check remaining data size before parsing it.
Bug:
23248776
Change-Id: I45cf53e58e4375afcf260b122264c968ec0ff6c8
Chong Zhang [Sat, 15 Aug 2015 01:01:09 +0000 (01:01 +0000)]
Merge "do not dequeue from native window after we hit fatal error" into mnc-dev
Eino-Ville Talvala [Fri, 14 Aug 2015 20:12:32 +0000 (13:12 -0700)]
Camera: Add camera type to ICameraService.getNumberOfCameras.
Also determine the number of 'normal' cameras present on
camera service startup, and ensure that all normal cameras have
IDs lower than the 'strange' cameras.
Bug:
23194168
Change-Id: I1f7b14825cb52707de698a955f85da1eaa932663
Chong Zhang [Fri, 14 Aug 2015 20:50:02 +0000 (13:50 -0700)]
do not dequeue from native window after we hit fatal error
bug:
22845824
Change-Id: I8c375790c697e02b6ab3ea54b84d3f70d5e78141
(cherry picked from commit
346de3c26a8fbd0fa0c8102f4a21ea4dcee4432a)
Eric Laurent [Thu, 13 Aug 2015 23:13:03 +0000 (23:13 +0000)]
am
d6d7296d: (-s ours) am
880323a2: am
2c0adb69: am
6faf4618: am
e4ac35fa: DO NOT MERGE - IAudioFlinger: add checks on binder calls
* commit '
d6d7296d01e7b72f7212837e2158e4c77d145fbe':
DO NOT MERGE - IAudioFlinger: add checks on binder calls
Eric Laurent [Thu, 13 Aug 2015 23:06:55 +0000 (23:06 +0000)]
am
880323a2: am
2c0adb69: am
6faf4618: am
e4ac35fa: DO NOT MERGE - IAudioFlinger: add checks on binder calls
* commit '
880323a217367bd0304fef7113623a9407dce106':
DO NOT MERGE - IAudioFlinger: add checks on binder calls
Ruben Brunk [Thu, 13 Aug 2015 22:59:35 +0000 (22:59 +0000)]
Merge "Fix deadlock conditions in Camera3Device." into mnc-dev
Eric Laurent [Thu, 13 Aug 2015 22:59:24 +0000 (22:59 +0000)]
am
2c0adb69: am
6faf4618: am
e4ac35fa: DO NOT MERGE - IAudioFlinger: add checks on binder calls
* commit '
2c0adb690ad2057d753a1d6892e9534e1648651b':
DO NOT MERGE - IAudioFlinger: add checks on binder calls
Eric Laurent [Thu, 13 Aug 2015 22:56:46 +0000 (22:56 +0000)]
am
b9b2eee2: (-s ours) am
f311db04: am
2517d62a: Merge "DO NOT MERGE - IAudioFlinger: add checks on binder calls" into lmp-mr1-dev
* commit '
b9b2eee2e2457d57d97a74bf34285842477382f5':
DO NOT MERGE - IAudioFlinger: add checks on binder calls
Eric Laurent [Thu, 13 Aug 2015 22:54:00 +0000 (22:54 +0000)]
am
6faf4618: am
e4ac35fa: DO NOT MERGE - IAudioFlinger: add checks on binder calls
* commit '
6faf46183099d4ed1a59daf6ae1490d3d891ada4':
DO NOT MERGE - IAudioFlinger: add checks on binder calls
Eric Laurent [Thu, 13 Aug 2015 22:52:19 +0000 (22:52 +0000)]
am
f311db04: am
2517d62a: Merge "DO NOT MERGE - IAudioFlinger: add checks on binder calls" into lmp-mr1-dev
* commit '
f311db04e72f66cb5b31d44e8780a1fcb88b3cdd':
DO NOT MERGE - IAudioFlinger: add checks on binder calls
Eric Laurent [Thu, 13 Aug 2015 22:46:29 +0000 (22:46 +0000)]
am
e4ac35fa: DO NOT MERGE - IAudioFlinger: add checks on binder calls
* commit '
e4ac35fa524b011f272d396b2c12515382bddb94':
DO NOT MERGE - IAudioFlinger: add checks on binder calls
Eric Laurent [Thu, 13 Aug 2015 22:45:33 +0000 (22:45 +0000)]
am
2517d62a: Merge "DO NOT MERGE - IAudioFlinger: add checks on binder calls" into lmp-mr1-dev
* commit '
2517d62a1c888332e7407295f935c4a55361db3a':
DO NOT MERGE - IAudioFlinger: add checks on binder calls
Eric Laurent [Thu, 13 Aug 2015 22:40:25 +0000 (22:40 +0000)]
Merge "DO NOT MERGE - IAudioFlinger: add checks on binder calls" into lmp-mr1-dev
Eric Laurent [Thu, 2 Apr 2015 20:49:15 +0000 (13:49 -0700)]
DO NOT MERGE - IAudioFlinger: add checks on binder calls
Limit number of ports and patches listed by
LIST_AUDIO_PATCHES and LIST_AUDIO_PORTS.
Also fix typo causing wrong pointer to be used when writing to Parcel.
Bug:
19573085.
Change-Id: I41a9c710e45738a4f11990160587856c429a4646
(cherry picked from commit
f75c2fef14354024ec27bff1444f9e50b5ef55a9)
Wei Jia [Thu, 13 Aug 2015 18:49:53 +0000 (18:49 +0000)]
am
c7a58efa: am
def6aff8: am
1c4549c3: am
84a131f2: am
39ab7cea: am
88aa97ea: am
3ce29384: libstagefright: fix possible overflow in amrwbenc.
* commit '
c7a58efaa8276036ae307a16bc9ee2411926ff9e':
libstagefright: fix possible overflow in amrwbenc.
Wei Jia [Thu, 13 Aug 2015 18:46:45 +0000 (18:46 +0000)]
am
def6aff8: am
1c4549c3: am
84a131f2: am
39ab7cea: am
88aa97ea: am
3ce29384: libstagefright: fix possible overflow in amrwbenc.
* commit '
def6aff8b8d9e38019f5fc0dccf9c24f48ad4d4a':
libstagefright: fix possible overflow in amrwbenc.
Wei Jia [Thu, 13 Aug 2015 18:42:27 +0000 (18:42 +0000)]
am
1c4549c3: am
84a131f2: am
39ab7cea: am
88aa97ea: am
3ce29384: libstagefright: fix possible overflow in amrwbenc.
* commit '
1c4549c38b7056ae6a4415eb65123d23d86c7b97':
libstagefright: fix possible overflow in amrwbenc.
Wei Jia [Thu, 13 Aug 2015 18:31:15 +0000 (18:31 +0000)]
am
84a131f2: am
39ab7cea: am
88aa97ea: am
3ce29384: libstagefright: fix possible overflow in amrwbenc.
* commit '
84a131f227398bd217f9c4ce91ff6fec13b29df4':
libstagefright: fix possible overflow in amrwbenc.
Wei Jia [Thu, 13 Aug 2015 18:21:40 +0000 (18:21 +0000)]
am
39ab7cea: am
88aa97ea: am
3ce29384: libstagefright: fix possible overflow in amrwbenc.
* commit '
39ab7cea0e3c14181e3e68b0f1bb5fa20a434b35':
libstagefright: fix possible overflow in amrwbenc.
Wei Jia [Thu, 13 Aug 2015 18:14:57 +0000 (18:14 +0000)]
am
88aa97ea: am
3ce29384: libstagefright: fix possible overflow in amrwbenc.
* commit '
88aa97ea87b7e4f7b4f82df3500754e03205ef60':
libstagefright: fix possible overflow in amrwbenc.
Wei Jia [Thu, 13 Aug 2015 18:08:00 +0000 (18:08 +0000)]
am
3ce29384: libstagefright: fix possible overflow in amrwbenc.
* commit '
3ce293842fed1b3abd2ff0aecd2a0c70a55086ee':
libstagefright: fix possible overflow in amrwbenc.
Wei Jia [Thu, 13 Aug 2015 17:20:23 +0000 (17:20 +0000)]
am
59a385e4: am
f66b81e7: am
f22da1cf: am
d7146ce7: am
3bb658ac: am
4e86a483: am
f51115bd: libstagefright: fix possible overflow in ID3.
* commit '
59a385e41be35b25422bbdf27ba5f3f894081671':
libstagefright: fix possible overflow in ID3.
Wei Jia [Thu, 13 Aug 2015 17:16:09 +0000 (17:16 +0000)]
am
f66b81e7: am
f22da1cf: am
d7146ce7: am
3bb658ac: am
4e86a483: am
f51115bd: libstagefright: fix possible overflow in ID3.
* commit '
f66b81e7c05f62105e7a8deefeaf395b28cb4bb3':
libstagefright: fix possible overflow in ID3.
Wei Jia [Thu, 13 Aug 2015 17:07:48 +0000 (17:07 +0000)]
am
f22da1cf: am
d7146ce7: am
3bb658ac: am
4e86a483: am
f51115bd: libstagefright: fix possible overflow in ID3.
* commit '
f22da1cf931bb9ae5d964106a138672ebb04fc02':
libstagefright: fix possible overflow in ID3.
Wei Jia [Thu, 13 Aug 2015 17:00:59 +0000 (17:00 +0000)]
am
d7146ce7: am
3bb658ac: am
4e86a483: am
f51115bd: libstagefright: fix possible overflow in ID3.
* commit '
d7146ce70c892e65ff3aa38af3d0afc18d49dd8c':
libstagefright: fix possible overflow in ID3.
Wei Jia [Thu, 13 Aug 2015 16:50:55 +0000 (16:50 +0000)]
am
3bb658ac: am
4e86a483: am
f51115bd: libstagefright: fix possible overflow in ID3.
* commit '
3bb658acd971414b15b0957e131294db33f7b75b':
libstagefright: fix possible overflow in ID3.
Wei Jia [Wed, 12 Aug 2015 17:08:41 +0000 (10:08 -0700)]
libstagefright: fix possible overflow in amrwbenc.
Bug:
23142203
Change-Id: I309df51e4df6412655f04cc093d792bf6c7944f7
(cherry picked from commit
9dd01777aa14bbb90a6cdccf97383bb4e3d717a5)
Wei Jia [Thu, 13 Aug 2015 16:42:54 +0000 (16:42 +0000)]
am
4e86a483: am
f51115bd: libstagefright: fix possible overflow in ID3.
* commit '
4e86a483a12b0139a8babf4754e5de340eaccd40':
libstagefright: fix possible overflow in ID3.
Wei Jia [Thu, 13 Aug 2015 16:34:17 +0000 (16:34 +0000)]
am
f51115bd: libstagefright: fix possible overflow in ID3.
* commit '
f51115bd8e44c2779b74477277c6f6046916e7cf':
libstagefright: fix possible overflow in ID3.
Wei Jia [Thu, 13 Aug 2015 02:45:16 +0000 (02:45 +0000)]
Merge "libstagefright: fix possible overflow in amrwbenc." into mnc-dev
Chien-Yu Chen [Thu, 13 Aug 2015 00:55:24 +0000 (00:55 +0000)]
Merge "Camera3Device: Relax InFlightMap size check" into mnc-dev
Chien-Yu Chen [Wed, 12 Aug 2015 23:46:24 +0000 (16:46 -0700)]
Camera3Device: Relax InFlightMap size check
Relax InFlightMap size check for high speed configurations to
allow more pending capture requests.
Bug:
23162274
Change-Id: I955fe9a0754f0daed001f4a2b34ccb50f2465a11
Wei Jia [Wed, 12 Aug 2015 17:08:41 +0000 (10:08 -0700)]
libstagefright: fix possible overflow in amrwbenc.
Bug:
23142203
Change-Id: I309df51e4df6412655f04cc093d792bf6c7944f7
Ruben Brunk [Wed, 12 Aug 2015 19:55:02 +0000 (12:55 -0700)]
Fix deadlock conditions in Camera3Device.
Potential deadlock conditions this addresses, include:
- Not waking up waiting threads for several situations where
the status had been updated.
- Not waking up all waiting thread when status had been updated
(only one thread was awoken due to use of signal).
- Threads clear status transitions before other waiting threads
have a chance to examine them.
Bug:
22448586
Change-Id: I53ba669d333a83d2bfa1ca3170d34acc6d8fe6e3
Eino-Ville Talvala [Wed, 12 Aug 2015 20:01:43 +0000 (20:01 +0000)]
Merge "Camera: Allocate correctly-sized buffers for DEPTH_POINT_CLOUD" into mnc-dev
Wei Jia [Wed, 12 Aug 2015 17:41:00 +0000 (10:41 -0700)]
libstagefright: fix possible overflow in ID3.
Bug:
23129786
Change-Id: I2e6b7a6927aa4362ab49dd6824bbb1abf7b4e661
(cherry picked from commit
09da86913ca97d7a818a8917b6601527e5e18a24)
Wei Jia [Wed, 12 Aug 2015 17:41:00 +0000 (10:41 -0700)]
libstagefright: fix possible overflow in ID3.
Bug:
23129786
Change-Id: I2e6b7a6927aa4362ab49dd6824bbb1abf7b4e661
Jeff Tinker [Tue, 11 Aug 2015 22:52:26 +0000 (15:52 -0700)]
Check integer overflow to prevent memory corruption
bug:
23016072
Change-Id: If3c9a835408773847c0024a812bd8b4915ebd680
Eino-Ville Talvala [Tue, 11 Aug 2015 22:08:53 +0000 (15:08 -0700)]
Camera: Allocate correctly-sized buffers for DEPTH_POINT_CLOUD
Bug:
20537722
Change-Id: I9fa2fcdcfd41cd3370732c70414914993d3dc94e
Eric Laurent [Tue, 11 Aug 2015 17:55:13 +0000 (17:55 +0000)]
Merge "audio policy: protect capture from telephony RX path." into mnc-dev
Nick Kralevich [Tue, 11 Aug 2015 05:39:22 +0000 (05:39 +0000)]
am
b07c4a8d: am
f86b266c: am
2c181bec: am
7f6a36d2: am
b6131acd: am
94f8150b: resolved conflicts for merge of
c86eae32 to klp-modular-dev
* commit '
b07c4a8d7f6c0ce52e5c63142e39e8c39fcaee35':
MPEG4Extractor.cpp: Add check for size == SIZE_MAX
Nick Kralevich [Tue, 11 Aug 2015 05:33:04 +0000 (05:33 +0000)]
am
f86b266c: am
2c181bec: am
7f6a36d2: am
b6131acd: am
94f8150b: resolved conflicts for merge of
c86eae32 to klp-modular-dev
* commit '
f86b266c14d61887b91ba4cfd5e9531877ee455a':
MPEG4Extractor.cpp: Add check for size == SIZE_MAX
Nick Kralevich [Tue, 11 Aug 2015 05:25:13 +0000 (05:25 +0000)]
am
2c181bec: am
7f6a36d2: am
b6131acd: am
94f8150b: resolved conflicts for merge of
c86eae32 to klp-modular-dev
* commit '
2c181bec9c781e7e50d99fb4e3b981b3d0a756f3':
MPEG4Extractor.cpp: Add check for size == SIZE_MAX
Nick Kralevich [Tue, 11 Aug 2015 05:19:26 +0000 (05:19 +0000)]
am
7f6a36d2: am
b6131acd: am
94f8150b: resolved conflicts for merge of
c86eae32 to klp-modular-dev
* commit '
7f6a36d20afb6383e5e46cdfa4a9e056c99c18e8':
MPEG4Extractor.cpp: Add check for size == SIZE_MAX
Nick Kralevich [Tue, 11 Aug 2015 05:11:59 +0000 (05:11 +0000)]
am
b6131acd: am
94f8150b: resolved conflicts for merge of
c86eae32 to klp-modular-dev
* commit '
b6131acd69ea32df926125d94c16174bc0ce1d4a':
MPEG4Extractor.cpp: Add check for size == SIZE_MAX
Nick Kralevich [Tue, 11 Aug 2015 05:04:40 +0000 (05:04 +0000)]
am
94f8150b: resolved conflicts for merge of
c86eae32 to klp-modular-dev
* commit '
94f8150be2041f73c2f185f2c3622a9537d47454':
MPEG4Extractor.cpp: Add check for size == SIZE_MAX
Nick Kralevich [Tue, 11 Aug 2015 04:24:54 +0000 (21:24 -0700)]
resolved conflicts for merge of
c86eae32 to klp-modular-dev
Change-Id: I127912aed9c9e57a985c46bee13d111e159d2c6f
Nick Kralevich [Tue, 11 Aug 2015 03:31:38 +0000 (03:31 +0000)]
am
9d9491f9: am
0dbd0d7b: am
c9924410: am
2fe61ed0: am
3b8d3fa0: am
186d1fb9: am
f4dfe12e: am
54d88fe2: am
aa8dab77: Merge "MPEG4Extractor.cpp: Add check for size == SIZE_MAX" into jb-dev
* commit '
9d9491f9fb83523cfe68f2aa26c14f72f70812fc':
MPEG4Extractor.cpp: Add check for size == SIZE_MAX
Nick Kralevich [Tue, 11 Aug 2015 03:24:13 +0000 (03:24 +0000)]
am
0dbd0d7b: am
c9924410: am
2fe61ed0: am
3b8d3fa0: am
186d1fb9: am
f4dfe12e: am
54d88fe2: am
aa8dab77: Merge "MPEG4Extractor.cpp: Add check for size == SIZE_MAX" into jb-dev
* commit '
0dbd0d7bfe340ac46271c7f87969431b62a023ed':
MPEG4Extractor.cpp: Add check for size == SIZE_MAX
Nick Kralevich [Tue, 11 Aug 2015 03:07:29 +0000 (03:07 +0000)]
am
c9924410: am
2fe61ed0: am
3b8d3fa0: am
186d1fb9: am
f4dfe12e: am
54d88fe2: am
aa8dab77: Merge "MPEG4Extractor.cpp: Add check for size == SIZE_MAX" into jb-dev
* commit '
c99244105803ac32f4cc698b5b2a85b225d925a2':
MPEG4Extractor.cpp: Add check for size == SIZE_MAX
Nick Kralevich [Tue, 11 Aug 2015 02:57:48 +0000 (02:57 +0000)]
am
2fe61ed0: am
3b8d3fa0: am
186d1fb9: am
f4dfe12e: am
54d88fe2: am
aa8dab77: Merge "MPEG4Extractor.cpp: Add check for size == SIZE_MAX" into jb-dev
* commit '
2fe61ed032e083dc39265f3b88274fcb8fbeed9b':
MPEG4Extractor.cpp: Add check for size == SIZE_MAX
Nick Kralevich [Tue, 11 Aug 2015 02:49:10 +0000 (02:49 +0000)]
am
3b8d3fa0: am
186d1fb9: am
f4dfe12e: am
54d88fe2: am
aa8dab77: Merge "MPEG4Extractor.cpp: Add check for size == SIZE_MAX" into jb-dev
* commit '
3b8d3fa0dd97c05f77c4686986812e40203678d2':
MPEG4Extractor.cpp: Add check for size == SIZE_MAX
Nick Kralevich [Tue, 11 Aug 2015 02:37:17 +0000 (02:37 +0000)]
am
186d1fb9: am
f4dfe12e: am
54d88fe2: am
aa8dab77: Merge "MPEG4Extractor.cpp: Add check for size == SIZE_MAX" into jb-dev
* commit '
186d1fb9b72439c1c3317d72e4a0f52f466e6861':
MPEG4Extractor.cpp: Add check for size == SIZE_MAX
Nick Kralevich [Tue, 11 Aug 2015 02:32:49 +0000 (02:32 +0000)]
am
f4dfe12e: am
54d88fe2: am
aa8dab77: Merge "MPEG4Extractor.cpp: Add check for size == SIZE_MAX" into jb-dev
* commit '
f4dfe12ecd26e7d6965a2abc062709b6d7d942c4':
MPEG4Extractor.cpp: Add check for size == SIZE_MAX
Wei Jia [Tue, 11 Aug 2015 02:28:27 +0000 (02:28 +0000)]
Merge "NuPlayer: set video surface directly when NuPlayer has not started yet." into mnc-dev
Nick Kralevich [Tue, 11 Aug 2015 02:26:38 +0000 (02:26 +0000)]
am
54d88fe2: am
aa8dab77: Merge "MPEG4Extractor.cpp: Add check for size == SIZE_MAX" into jb-dev
* commit '
54d88fe2f17b1c5c6e4d0d1d1e36089fea3a1df0':
MPEG4Extractor.cpp: Add check for size == SIZE_MAX
Nick Kralevich [Tue, 11 Aug 2015 02:20:00 +0000 (02:20 +0000)]
am
aa8dab77: Merge "MPEG4Extractor.cpp: Add check for size == SIZE_MAX" into jb-dev
* commit '
aa8dab77aa9ef1bb6e5414ee5e773001de725bef':
MPEG4Extractor.cpp: Add check for size == SIZE_MAX
Wei Jia [Mon, 10 Aug 2015 22:11:54 +0000 (15:11 -0700)]
NuPlayer: set video surface directly when NuPlayer has not started yet.
Bug:
22119956
Change-Id: Ie174f4fc495ab8418993ff7887aaa6ae721c6008
Nick Kralevich [Sat, 8 Aug 2015 17:40:40 +0000 (17:40 +0000)]
am
5aa85d05: am
74cda34a: am
41d93c2f: am
c88ddfc0: am
2abbc048: am
ba34c2ba: am
f59348ed: am
0080e03e: am
3ebcce0e: am
2c0f9591: am
fea5921b: am
9fff1d37: am
d9d35098: am
af6b3a6b: am
bce77a36: am
0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
* commit '
5aa85d05aaeb5509597b7876942b6f5e543a451c':
MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
Nick Kralevich [Sat, 8 Aug 2015 17:33:12 +0000 (17:33 +0000)]
am
74cda34a: am
41d93c2f: am
c88ddfc0: am
2abbc048: am
ba34c2ba: am
f59348ed: am
0080e03e: am
3ebcce0e: am
2c0f9591: am
fea5921b: am
9fff1d37: am
d9d35098: am
af6b3a6b: am
bce77a36: am
0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
* commit '
74cda34ac909eb713cec22bebb08ecaeefd8f7dd':
MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
Nick Kralevich [Sat, 8 Aug 2015 17:27:59 +0000 (17:27 +0000)]
am
41d93c2f: am
c88ddfc0: am
2abbc048: am
ba34c2ba: am
f59348ed: am
0080e03e: am
3ebcce0e: am
2c0f9591: am
fea5921b: am
9fff1d37: am
d9d35098: am
af6b3a6b: am
bce77a36: am
0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
* commit '
41d93c2f0a744fc6cd1aafce9a0eef57355bbf0f':
MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
Nick Kralevich [Sat, 8 Aug 2015 17:18:57 +0000 (17:18 +0000)]
am
c88ddfc0: am
2abbc048: am
ba34c2ba: am
f59348ed: am
0080e03e: am
3ebcce0e: am
2c0f9591: am
fea5921b: am
9fff1d37: am
d9d35098: am
af6b3a6b: am
bce77a36: am
0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
* commit '
c88ddfc09338969a4c8fc32be1d3dffb9022a237':
MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
Nick Kralevich [Sat, 8 Aug 2015 17:11:35 +0000 (17:11 +0000)]
am
2abbc048: am
ba34c2ba: am
f59348ed: am
0080e03e: am
3ebcce0e: am
2c0f9591: am
fea5921b: am
9fff1d37: am
d9d35098: am
af6b3a6b: am
bce77a36: am
0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
* commit '
2abbc048837182bda04037f53309cde4c73f017d':
MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
Nick Kralevich [Sat, 8 Aug 2015 17:01:56 +0000 (17:01 +0000)]
am
ba34c2ba: am
f59348ed: am
0080e03e: am
3ebcce0e: am
2c0f9591: am
fea5921b: am
9fff1d37: am
d9d35098: am
af6b3a6b: am
bce77a36: am
0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
* commit '
ba34c2ba414352ed0c1b9188f51c5445b04af2c6':
MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
Nick Kralevich [Sat, 8 Aug 2015 16:55:57 +0000 (16:55 +0000)]
am
f59348ed: am
0080e03e: am
3ebcce0e: am
2c0f9591: am
fea5921b: am
9fff1d37: am
d9d35098: am
af6b3a6b: am
bce77a36: am
0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
* commit '
f59348edfc54baa8f6e6532c6484656cf444d199':
MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
Nick Kralevich [Sat, 8 Aug 2015 16:41:15 +0000 (16:41 +0000)]
am
0080e03e: am
3ebcce0e: am
2c0f9591: am
fea5921b: am
9fff1d37: am
d9d35098: am
af6b3a6b: am
bce77a36: am
0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
* commit '
0080e03e2a69dcb5ecbcb2848f358ca73163714c':
MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
Nick Kralevich [Sat, 8 Aug 2015 16:34:15 +0000 (16:34 +0000)]
am
3ebcce0e: am
2c0f9591: am
fea5921b: am
9fff1d37: am
d9d35098: am
af6b3a6b: am
bce77a36: am
0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
* commit '
3ebcce0e3fda1ffae9453ca0cc389ee852e1d0a2':
MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
Nick Kralevich [Sat, 8 Aug 2015 16:23:51 +0000 (16:23 +0000)]
am
2c0f9591: am
fea5921b: am
9fff1d37: am
d9d35098: am
af6b3a6b: am
bce77a36: am
0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
* commit '
2c0f959112a1d9048e8dc527f2f9dc0cc3e490c9':
MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
Nick Kralevich [Sat, 8 Aug 2015 16:16:08 +0000 (16:16 +0000)]
am
fea5921b: am
9fff1d37: am
d9d35098: am
af6b3a6b: am
bce77a36: am
0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
* commit '
fea5921b975cf43c88b8f93d4f2500abde6088be':
MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
Nick Kralevich [Sat, 8 Aug 2015 16:08:43 +0000 (16:08 +0000)]
am
9fff1d37: am
d9d35098: am
af6b3a6b: am
bce77a36: am
0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
* commit '
9fff1d37d6129dfce7a6f89004ec4a9cea9c9cad':
MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
Nick Kralevich [Sat, 8 Aug 2015 16:01:24 +0000 (16:01 +0000)]
am
d9d35098: am
af6b3a6b: am
bce77a36: am
0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
* commit '
d9d35098aaaa546d79d0707734aac9b4b12c5be1':
MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
Nick Kralevich [Sat, 8 Aug 2015 15:19:26 +0000 (15:19 +0000)]
am
af6b3a6b: am
bce77a36: am
0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
* commit '
af6b3a6bc44e65e6dbf95c1e5dadf76aa78018d9':
MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
Nick Kralevich [Sat, 8 Aug 2015 14:55:23 +0000 (14:55 +0000)]
Merge "MPEG4Extractor.cpp: Add check for size == SIZE_MAX" into jb-dev
Marco Nelissen [Sat, 8 Aug 2015 03:24:44 +0000 (03:24 +0000)]
Marco Nelissen [Sat, 8 Aug 2015 03:19:34 +0000 (03:19 +0000)]
Marco Nelissen [Sat, 8 Aug 2015 03:12:58 +0000 (03:12 +0000)]
Marco Nelissen [Sat, 8 Aug 2015 03:05:51 +0000 (03:05 +0000)]
Marco Nelissen [Sat, 8 Aug 2015 02:59:00 +0000 (02:59 +0000)]
Marco Nelissen [Sat, 8 Aug 2015 02:52:55 +0000 (02:52 +0000)]
am
80c17e0d: am
450e1015: Fix Ogg album art
* commit '
80c17e0d42248053edf7243e026995fefcf6aabd':
Fix Ogg album art
Marco Nelissen [Sat, 8 Aug 2015 02:47:04 +0000 (02:47 +0000)]
am
450e1015: Fix Ogg album art
* commit '
450e1015b7939292ca988dd1b4f0303a094478e9':
Fix Ogg album art
Marco Nelissen [Sat, 8 Aug 2015 01:49:48 +0000 (01:49 +0000)]
am
b3adb709: am
6323529b: am
2424d28b: am
c40ef744: am
af3c0475: am
9c67741f: am
2e637bfd: Merge "Extra sanity checks on sample size and resolution" into klp-dev
* commit '
b3adb709bd278004de5764ce45b51140aefcc4c8':
Extra sanity checks on sample size and resolution
Marco Nelissen [Sat, 8 Aug 2015 01:43:23 +0000 (01:43 +0000)]
am
6323529b: am
2424d28b: am
c40ef744: am
af3c0475: am
9c67741f: am
2e637bfd: Merge "Extra sanity checks on sample size and resolution" into klp-dev
* commit '
6323529b60f29ad1e18757f4aadc08f2aa0e846b':
Extra sanity checks on sample size and resolution
Marco Nelissen [Sat, 8 Aug 2015 01:36:56 +0000 (01:36 +0000)]
am
2424d28b: am
c40ef744: am
af3c0475: am
9c67741f: am
2e637bfd: Merge "Extra sanity checks on sample size and resolution" into klp-dev
* commit '
2424d28b42edd66e6806244cddf2a5eb8675f652':
Extra sanity checks on sample size and resolution
Marco Nelissen [Sat, 8 Aug 2015 01:30:35 +0000 (01:30 +0000)]
am
c40ef744: am
af3c0475: am
9c67741f: am
2e637bfd: Merge "Extra sanity checks on sample size and resolution" into klp-dev
* commit '
c40ef74448ddb09b676cc4c79a202ee73fccad39':
Extra sanity checks on sample size and resolution
Marco Nelissen [Sat, 8 Aug 2015 01:25:33 +0000 (01:25 +0000)]
am
af3c0475: am
9c67741f: am
2e637bfd: Merge "Extra sanity checks on sample size and resolution" into klp-dev
* commit '
af3c0475b9ee8b9e69e435b2bdd11e5c9172b050':
Extra sanity checks on sample size and resolution
Marco Nelissen [Sat, 8 Aug 2015 01:17:58 +0000 (01:17 +0000)]
am
9c67741f: am
2e637bfd: Merge "Extra sanity checks on sample size and resolution" into klp-dev
* commit '
9c67741f9f7ccc1007c7ecb44b8037210c733723':
Extra sanity checks on sample size and resolution
Marco Nelissen [Sat, 8 Aug 2015 01:12:33 +0000 (01:12 +0000)]
am
2e637bfd: Merge "Extra sanity checks on sample size and resolution" into klp-dev
* commit '
2e637bfd64c59200414130671e32e3e087e9f147':
Extra sanity checks on sample size and resolution
Marco Nelissen [Thu, 6 Aug 2015 15:03:47 +0000 (08:03 -0700)]
Fix Ogg album art
Bug:
23036083
Bug: https://code.google.com/p/android/issues/detail?id=182053
Change-Id: I1a5cbe06990900160c2addade238c1e9feab8f71
(cherry picked from commit
c63cc509404b9328aedd1be3adc4e87cd07b4eb1)
Marco Nelissen [Sat, 8 Aug 2015 01:00:27 +0000 (01:00 +0000)]
Merge "Fix Ogg album art" into mnc-dev
Marco Nelissen [Sat, 8 Aug 2015 00:59:49 +0000 (00:59 +0000)]
Merge "Extra sanity checks on sample size and resolution" into klp-dev
Nick Kralevich [Fri, 7 Aug 2015 23:09:03 +0000 (23:09 +0000)]
am
bce77a36: am
0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
* commit '
bce77a36125b25ce864b40bd5938ca89becea898':
MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
Eric Laurent [Fri, 7 Aug 2015 20:59:42 +0000 (13:59 -0700)]
audio policy: protect capture from telephony RX path.
Add permission check if the capture device selected is telephony
RX path.
Bug:
23017158.
Change-Id: Iaa34d836e6cf46b7cbbf2483fcd4306dcd27ce90
Marco Nelissen [Thu, 6 Aug 2015 15:03:47 +0000 (08:03 -0700)]
Fix Ogg album art
Bug:
23036083
Bug: https://code.google.com/p/android/issues/detail?id=182053
Change-Id: I1a5cbe06990900160c2addade238c1e9feab8f71
Nick Kralevich [Fri, 7 Aug 2015 18:41:28 +0000 (18:41 +0000)]
am
0e20b209: MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
* commit '
0e20b2093aa2bbc93afed8d68d3765d18a431b74':
MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
Nick Kralevich [Fri, 7 Aug 2015 18:19:24 +0000 (11:19 -0700)]
MPEG4Extractor.cpp: handle chunk_size > SIZE_MAX
chunk_size is a uint64_t, so it can legitimately be bigger
than SIZE_MAX, which would cause the subtraction to underflow.
https://code.google.com/p/android/issues/detail?id=182251
Bug:
23034759
Change-Id: Ic1637fb26bf6edb0feb1bcf2876fd370db1ed547
Joshua J. Drake [Fri, 7 Aug 2015 18:19:41 +0000 (18:19 +0000)]
am
daee18a3: am
9b9e8c6f: am
8fec74bd: am
b3949ea5: am
72abba8b: am
276cec63: am
4254be9a: am
9364bdc9: am
905aae46: am
11c88f66: am
2796ba1c: am
a555788d: am
0e33cb2d: am
e4ccf3a1: am
3329a19b: am
c87faed6: Fix integer underflow in covr MPEG4 processing
* commit '
daee18a3af3c1025e8f9abaaa68c6d9bfb2490f4':
Fix integer underflow in covr MPEG4 processing
Joshua J. Drake [Fri, 7 Aug 2015 18:19:41 +0000 (18:19 +0000)]
am
8b1956f0: am
6ad451bb: am
4c0569ee: am
38b7324c: am
437d47cb: am
f13cc52d: am
8e0e43d2: am
3621c056: am
bcc8e581: am
bb99a362: am
8d60fc3e: am
338bbf53: am
fd334e34: am
03d539a7: am
a5b9055d: am
f1ce97dd: Fix integer overflow when handling MPEG4 tx3g atom
* commit '
8b1956f048105c2074b3316c8f6ab9df2ea7c19a':
Fix integer overflow when handling MPEG4 tx3g atom
OSDN Git Service
