OSDN Git Service
Wei Jia [Wed, 16 Sep 2015 22:01:16 +0000 (15:01 -0700)]
IAudioFlinger: fix the missing initialization of variable to ensure no info leak when writing them to Parcel.
Bug:
23953967
Change-Id: I3a1d0144ba3832649e322c197ff0f03305ee7829
Wei Jia [Wed, 16 Sep 2015 16:00:38 +0000 (16:00 +0000)]
Merge "IAudioFlinger: always initialize variables to ensure no info leak when writing them to Parcel." into mnc-dev
Daniel Cashman [Wed, 16 Sep 2015 15:04:26 +0000 (15:04 +0000)]
Merge "Add DUMP permission check to ResourceManagerService." into mnc-dev
Wonsik Kim [Mon, 14 Sep 2015 22:34:45 +0000 (07:34 +0900)]
resolved conflicts for
421977ae to mnc-dev
Change-Id: I0d195dece9abf50cafc9b6393c68b72d99b2482a
dcashman [Fri, 11 Sep 2015 16:33:01 +0000 (09:33 -0700)]
Add DUMP permission check to ResourceManagerService.
Bug:
23999740
Change-Id: I3165404add455528b22951ba47b682a075b50087
(cherry picked from commit
014e91e471edba3f9b2c71ff6025274716b0f587)
Wonsik Kim [Mon, 14 Sep 2015 19:46:50 +0000 (19:46 +0000)]
am
c53328a5: am
67f36a8e: resolved conflicts for
76b704e3 to lmp-mr1-dev
* commit '
c53328a55427224dd42534d2b500728e38a83ca2':
DO NOT MERGE: Protect data source access with mutex during disconnect
Wonsik Kim [Mon, 14 Sep 2015 19:39:14 +0000 (19:39 +0000)]
am
67f36a8e: resolved conflicts for
76b704e3 to lmp-mr1-dev
* commit '
67f36a8e6130f5c22ab177b0d29f5705e86daca2':
DO NOT MERGE: Protect data source access with mutex during disconnect
Wonsik Kim [Mon, 14 Sep 2015 05:56:20 +0000 (14:56 +0900)]
resolved conflicts for
76b704e3 to lmp-mr1-dev
Change-Id: I843f6b4080b06581c52683ab4af5261e974cd7af
Wonsik Kim [Mon, 14 Sep 2015 04:53:35 +0000 (04:53 +0000)]
Merge "NuCachedSource2: fix possible erroneous early free" into mnc-dev
Robert Shih [Sat, 12 Sep 2015 04:07:17 +0000 (04:07 +0000)]
am
f3eb8268: DO NOT MERGE: Protect data source access with mutex during disconnect
* commit '
f3eb82683a80341f5ac23057aab733a57963cab2':
DO NOT MERGE: Protect data source access with mutex during disconnect
Wonsik Kim [Fri, 11 Sep 2015 06:48:55 +0000 (06:48 +0000)]
Merge "Avoid size_t overflow in base64 decoding once again" into mnc-dev
Wei Jia [Thu, 10 Sep 2015 16:47:29 +0000 (09:47 -0700)]
IAudioFlinger: always initialize variables to ensure no info leak when writing them to Parcel.
Bug:
23953967
Change-Id: Ibbe841da149038675e9e8daea76c77558bc8564b
Wei Jia [Thu, 10 Sep 2015 13:40:43 +0000 (13:40 +0000)]
Merge "IAudioFlinger: clear config before reading it from parcel." into mnc-dev
Wei Jia [Wed, 9 Sep 2015 16:48:34 +0000 (09:48 -0700)]
IAudioFlinger: clear config before reading it from parcel.
Bug:
23905951
Bug:
23912202
Change-Id: Id13a9d3cae2c09e7381b841e67ddfb188274d74c
Wonsik Kim [Tue, 8 Sep 2015 08:32:28 +0000 (17:32 +0900)]
NuCachedSource2: fix possible erroneous early free
Because the constructor of NuCachedSource2 sent a message to
AHandlerReflector object, AHandlerReflector::onMessageReceived could
have executed just before the object gets wrapped in a strong
pointer, resulting in erroneous early free. Fix the issue by using
static Create function to ensure the message is sent after the
object is wrapped in a sp.
Bug:
23882800
Change-Id: I38a9d7a3083f184b4c81d0b00ba1661721278855
Robert Shih [Wed, 2 Sep 2015 21:02:47 +0000 (14:02 -0700)]
DO NOT MERGE: Protect data source access with mutex during disconnect
Bug:
23658148
Change-Id: Ic37cac7b5d166143e0b77e9919b0aaef486e4fdd
Robert Shih [Wed, 2 Sep 2015 21:02:47 +0000 (14:02 -0700)]
Protect data source access with mutex during disconnect
Bug:
23658148
Change-Id: Ic37cac7b5d166143e0b77e9919b0aaef486e4fdd
Wei Jia [Tue, 8 Sep 2015 15:55:20 +0000 (15:55 +0000)]
Merge "libstagefright: fix A_Refl to return immediately when there is an error." into mnc-dev
Wonsik Kim [Mon, 7 Sep 2015 06:52:27 +0000 (15:52 +0900)]
Avoid size_t overflow in base64 decoding once again
Switch to foundation base64 function in OggExtractor and fix the
issue there.
Bug:
23707088
Change-Id: I999ae911177c88dc13f9ee9796ca93c5928b20b0
Robert Shih [Fri, 4 Sep 2015 17:55:48 +0000 (17:55 +0000)]
am
becceb11: am
b57ffbb5: am
d021f7e5: am
b18c0276: am
2b63b91b: am
c1e989e7: am
13ff64c2: Merge "Zero out return values in media binder calls" into klp-dev
* commit '
becceb1136e7eb01db7dd865cb98a57117212879':
Zero out return values in media binder calls
Andy Hung [Fri, 4 Sep 2015 17:55:47 +0000 (17:55 +0000)]
am
7734e37e: am
a1179678: am
be695f0a: am
5e193041: am
52a4fc09: am
3732a3ac: am
ab203130: Merge "Make IEffect command more robust (second try)" into klp-dev
* commit '
7734e37efe4ad47d91cdc5cfa6703d77a7a2ac0c':
Make IEffect command more robust (second try)
Marco Nelissen [Fri, 4 Sep 2015 17:55:46 +0000 (17:55 +0000)]
am
a6e476cb: am
2cec2b4c: am
9bbc490e: am
facd279e: am
7d34959b: am
16e12007: am
74888428: Merge "Fix timedtext parsing" into klp-dev
* commit '
a6e476cb04dfccd5adde467b9b55ecb1f48dff58':
Fix timedtext parsing
Wei Jia [Fri, 4 Sep 2015 17:55:45 +0000 (17:55 +0000)]
am
1a844448: (-s ours) am
933fd689: am
ec58a72b: am
bf03b948: am
75143f30: am
03b7f72b: (-s ours) am
9d916c77: DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
* commit '
1a8444481c32422ea46e2a2062d9d49fc11eeeef':
DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
Wei Jia [Fri, 4 Sep 2015 17:55:43 +0000 (17:55 +0000)]
am
e457eb05: resolved conflicts for
3b8747ca to lmp-mr1-ub-dev
* commit '
e457eb058643d3e2b305a477e5c7d4dbd9e4a165':
DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
Robert Shih [Fri, 4 Sep 2015 17:49:32 +0000 (17:49 +0000)]
am
b57ffbb5: am
d021f7e5: am
b18c0276: am
2b63b91b: am
c1e989e7: am
13ff64c2: Merge "Zero out return values in media binder calls" into klp-dev
* commit '
b57ffbb5486a58e0dbb03466e9f3a5e51d6cf0f3':
Zero out return values in media binder calls
Andy Hung [Fri, 4 Sep 2015 17:49:31 +0000 (17:49 +0000)]
am
a1179678: am
be695f0a: am
5e193041: am
52a4fc09: am
3732a3ac: am
ab203130: Merge "Make IEffect command more robust (second try)" into klp-dev
* commit '
a1179678752e5755297a2bb66c730f4fd22856e3':
Make IEffect command more robust (second try)
Marco Nelissen [Fri, 4 Sep 2015 17:49:30 +0000 (17:49 +0000)]
am
2cec2b4c: am
9bbc490e: am
facd279e: am
7d34959b: am
16e12007: am
74888428: Merge "Fix timedtext parsing" into klp-dev
* commit '
2cec2b4c179b1a946b6f745a8404bf1ee70f825c':
Fix timedtext parsing
Wei Jia [Fri, 4 Sep 2015 17:49:28 +0000 (17:49 +0000)]
am
933fd689: am
ec58a72b: am
bf03b948: am
75143f30: am
03b7f72b: (-s ours) am
9d916c77: DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
* commit '
933fd689b5511f096b864b84c95855d691d06a73':
DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
Wei Jia [Fri, 4 Sep 2015 16:13:37 +0000 (09:13 -0700)]
libstagefright: fix A_Refl to return immediately when there is an error.
Bug:
23609206
Change-Id: I2ad25fb208df17f5a5b6d6b356eff2f400627f22
Wei Jia [Fri, 4 Sep 2015 16:37:50 +0000 (09:37 -0700)]
resolved conflicts for
3b8747ca to lmp-mr1-ub-dev
Merge commit '
3b8747ca601175da0c94537e49f3097769a09501' into HEAD
libstagefright: sanity check size before dereferencing pointer in Utils.cpp
Also remove some CHECK's.
Bug:
23680780
(cherry picked from commit
7bb772e0c643ff3292599cf485b9dbf232bf39a4)
Change-Id: I5b919716178eb3ba844b21e497b792e6ac61554d
Robert Shih [Fri, 4 Sep 2015 16:16:33 +0000 (16:16 +0000)]
am
d021f7e5: am
b18c0276: am
2b63b91b: am
c1e989e7: am
13ff64c2: Merge "Zero out return values in media binder calls" into klp-dev
* commit '
d021f7e5686074771981a6386b59e803160a1073':
Zero out return values in media binder calls
Andy Hung [Fri, 4 Sep 2015 16:16:32 +0000 (16:16 +0000)]
am
be695f0a: am
5e193041: am
52a4fc09: am
3732a3ac: am
ab203130: Merge "Make IEffect command more robust (second try)" into klp-dev
* commit '
be695f0aa9b8fb3a2dc7983db71a1a78b1268b4b':
Make IEffect command more robust (second try)
Marco Nelissen [Fri, 4 Sep 2015 16:16:31 +0000 (16:16 +0000)]
am
9bbc490e: am
facd279e: am
7d34959b: am
16e12007: am
74888428: Merge "Fix timedtext parsing" into klp-dev
* commit '
9bbc490e17d38a9734a2b95a308100a7d0ec6dcd':
Fix timedtext parsing
Wei Jia [Fri, 4 Sep 2015 16:16:30 +0000 (16:16 +0000)]
am
ec58a72b: am
bf03b948: am
75143f30: am
03b7f72b: (-s ours) am
9d916c77: DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
* commit '
ec58a72ba15425f5b748180822f39716b7e3c8dc':
DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
Wei Jia [Fri, 4 Sep 2015 16:16:29 +0000 (16:16 +0000)]
am
ce34a82f: am
7ea22fce: am
c6a2815e: DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
* commit '
ce34a82fe2b5b2b955600fbfab1df964aa4934eb':
DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
Robert Shih [Fri, 4 Sep 2015 16:05:00 +0000 (16:05 +0000)]
am
b18c0276: am
2b63b91b: am
c1e989e7: am
13ff64c2: Merge "Zero out return values in media binder calls" into klp-dev
* commit '
b18c02761fe357599f9dad17355e38ec1d3226f2':
Zero out return values in media binder calls
Andy Hung [Fri, 4 Sep 2015 16:04:59 +0000 (16:04 +0000)]
am
5e193041: am
52a4fc09: am
3732a3ac: am
ab203130: Merge "Make IEffect command more robust (second try)" into klp-dev
* commit '
5e193041ab8a541b478dd1b61c8c8cd24bca2ab5':
Make IEffect command more robust (second try)
Marco Nelissen [Fri, 4 Sep 2015 16:04:58 +0000 (16:04 +0000)]
am
facd279e: am
7d34959b: am
16e12007: am
74888428: Merge "Fix timedtext parsing" into klp-dev
* commit '
facd279ed552416adcf0ff4ef22b7a9cd166ccea':
Fix timedtext parsing
Wei Jia [Fri, 4 Sep 2015 16:04:57 +0000 (16:04 +0000)]
am
bf03b948: am
75143f30: am
03b7f72b: (-s ours) am
9d916c77: DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
* commit '
bf03b948f12db86861c312dbb67ce82ff73f4bbb':
DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
Wei Jia [Fri, 4 Sep 2015 16:04:54 +0000 (16:04 +0000)]
am
7ea22fce: am
c6a2815e: DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
* commit '
7ea22fce4fe6ac361fce1df3b583366933848b17':
DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
Robert Shih [Fri, 4 Sep 2015 15:43:04 +0000 (15:43 +0000)]
am
2b63b91b: am
c1e989e7: am
13ff64c2: Merge "Zero out return values in media binder calls" into klp-dev
* commit '
2b63b91b84c75afdef4213aa11b0dcc8e7d735a3':
Zero out return values in media binder calls
Andy Hung [Fri, 4 Sep 2015 15:43:02 +0000 (15:43 +0000)]
am
52a4fc09: am
3732a3ac: am
ab203130: Merge "Make IEffect command more robust (second try)" into klp-dev
* commit '
52a4fc09b483a20ee7d5970be01598ee262f7088':
Make IEffect command more robust (second try)
Marco Nelissen [Fri, 4 Sep 2015 15:43:00 +0000 (15:43 +0000)]
am
7d34959b: am
16e12007: am
74888428: Merge "Fix timedtext parsing" into klp-dev
* commit '
7d34959b10e0e8a9ac4cdd5e10a6d016513aa03f':
Fix timedtext parsing
Wei Jia [Fri, 4 Sep 2015 15:42:50 +0000 (15:42 +0000)]
am
75143f30: am
03b7f72b: (-s ours) am
9d916c77: DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
* commit '
75143f30b31a7b38362281d0bbf6109b0e423441':
DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
Wei Jia [Fri, 4 Sep 2015 15:42:47 +0000 (15:42 +0000)]
am
c6a2815e: DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
* commit '
c6a2815eadfce62702d58b3fa3887f24c49e1864':
DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
Robert Shih [Thu, 3 Sep 2015 18:05:44 +0000 (18:05 +0000)]
am
c1e989e7: am
13ff64c2: Merge "Zero out return values in media binder calls" into klp-dev
* commit '
c1e989e76a461ea69e293839b3c29b634a462bd5':
Zero out return values in media binder calls
Andy Hung [Thu, 3 Sep 2015 18:05:43 +0000 (18:05 +0000)]
am
3732a3ac: am
ab203130: Merge "Make IEffect command more robust (second try)" into klp-dev
* commit '
3732a3acafa7eb621bc26cca3eb00150ea12d2e2':
Make IEffect command more robust (second try)
Marco Nelissen [Thu, 3 Sep 2015 18:05:42 +0000 (18:05 +0000)]
am
16e12007: am
74888428: Merge "Fix timedtext parsing" into klp-dev
* commit '
16e12007ab1581e1b6aa973f3c83b2a45a816881':
Fix timedtext parsing
Robert Shih [Thu, 3 Sep 2015 17:58:08 +0000 (17:58 +0000)]
am
4abb48c3: am
898e8575: am
72b0abdf: Merge "Zero out return values in audio binder calls" into lmp-mr1-dev
* commit '
4abb48c30cd7821f3397ccd7de8deb3eb645b385':
Zero out return values in audio binder calls
Robert Shih [Thu, 3 Sep 2015 17:52:44 +0000 (17:52 +0000)]
am
13ff64c2: Merge "Zero out return values in media binder calls" into klp-dev
* commit '
13ff64c2db84f4e7cac3396700e333b48c42c7ee':
Zero out return values in media binder calls
Andy Hung [Thu, 3 Sep 2015 17:52:43 +0000 (17:52 +0000)]
am
ab203130: Merge "Make IEffect command more robust (second try)" into klp-dev
* commit '
ab20313074bb109f29f677c3f09d5da1a48c94e7':
Make IEffect command more robust (second try)
Marco Nelissen [Thu, 3 Sep 2015 17:52:42 +0000 (17:52 +0000)]
am
74888428: Merge "Fix timedtext parsing" into klp-dev
* commit '
74888428e51a2aa123e301912d09973bd9310c33':
Fix timedtext parsing
Robert Shih [Thu, 3 Sep 2015 17:46:04 +0000 (17:46 +0000)]
am
898e8575: am
72b0abdf: Merge "Zero out return values in audio binder calls" into lmp-mr1-dev
* commit '
898e857594b738f88be4de5addc8ca296dfabd74':
Zero out return values in audio binder calls
Robert Shih [Thu, 3 Sep 2015 17:32:48 +0000 (17:32 +0000)]
am
72b0abdf: Merge "Zero out return values in audio binder calls" into lmp-mr1-dev
* commit '
72b0abdf56c655aae3052f7f762f5e6d8168a154':
Zero out return values in audio binder calls
Wei Jia [Thu, 3 Sep 2015 17:24:20 +0000 (17:24 +0000)]
am
03b7f72b: (-s ours) am
9d916c77: DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
* commit '
03b7f72b98ef0a4fa58a84a27d2f8735342faf58':
DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
Robert Shih [Thu, 3 Sep 2015 17:21:37 +0000 (17:21 +0000)]
Merge "Zero out return values in audio binder calls" into lmp-mr1-dev
Robert Shih [Thu, 3 Sep 2015 17:21:20 +0000 (17:21 +0000)]
Merge "Zero out return values in media binder calls" into klp-dev
Andy Hung [Thu, 3 Sep 2015 17:16:12 +0000 (17:16 +0000)]
Merge "Make IEffect command more robust (second try)" into klp-dev
Wei Jia [Thu, 3 Sep 2015 17:14:06 +0000 (17:14 +0000)]
am
9d916c77: DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
* commit '
9d916c771ca32cb2d0df27b85ce3e17bb6b48eaf':
DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
Marco Nelissen [Thu, 3 Sep 2015 17:05:55 +0000 (17:05 +0000)]
Merge "Fix timedtext parsing" into klp-dev
Wei Jia [Tue, 1 Sep 2015 18:14:18 +0000 (11:14 -0700)]
DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
Also remove some CHECK's.
Bug:
23680780
Change-Id: I62d0941e203e40209fa6fbe3f923f3efdc5a6c23
(cherry picked from commit
7bb772e0c643ff3292599cf485b9dbf232bf39a4)
Wei Jia [Tue, 1 Sep 2015 18:14:18 +0000 (11:14 -0700)]
DO NOT MERGE - libstagefright: sanity check size before dereferencing pointer in Utils.cpp
Also remove some CHECK's.
Bug:
23680780
Change-Id: I62d0941e203e40209fa6fbe3f923f3efdc5a6c23
(cherry picked from commit
7bb772e0c643ff3292599cf485b9dbf232bf39a4)
Wei Jia [Thu, 3 Sep 2015 15:54:39 +0000 (15:54 +0000)]
Merge "libstagefright: sanity check size before dereferencing pointer in Utils.cpp" into mnc-dev
Wonsik Kim [Thu, 3 Sep 2015 10:21:14 +0000 (10:21 +0000)]
am
ac774d53: am
eda49b16: am
3f79dbfc: am
d77786c6: am
a6c650a9: am
436b32d1: am
d2605273: Ogg: avoid size_t overflow in base64 decoding
* commit '
ac774d53fff5a580b9fe41ac4a7c6bb96b5137ef':
Ogg: avoid size_t overflow in base64 decoding
Wonsik Kim [Thu, 3 Sep 2015 10:11:57 +0000 (10:11 +0000)]
am
eda49b16: am
3f79dbfc: am
d77786c6: am
a6c650a9: am
436b32d1: am
d2605273: Ogg: avoid size_t overflow in base64 decoding
* commit '
eda49b160b0d730140f0ab48cf7a4013f2d97f30':
Ogg: avoid size_t overflow in base64 decoding
Wonsik Kim [Thu, 3 Sep 2015 10:04:32 +0000 (10:04 +0000)]
am
3f79dbfc: am
d77786c6: am
a6c650a9: am
436b32d1: am
d2605273: Ogg: avoid size_t overflow in base64 decoding
* commit '
3f79dbfcb1a62c28094b403ba954ab4543d709f7':
Ogg: avoid size_t overflow in base64 decoding
Wonsik Kim [Thu, 3 Sep 2015 09:54:28 +0000 (09:54 +0000)]
am
d77786c6: am
a6c650a9: am
436b32d1: am
d2605273: Ogg: avoid size_t overflow in base64 decoding
* commit '
d77786c699c3f846b57b8a8ea00f20749f550960':
Ogg: avoid size_t overflow in base64 decoding
Wonsik Kim [Thu, 3 Sep 2015 09:46:28 +0000 (09:46 +0000)]
am
a6c650a9: am
436b32d1: am
d2605273: Ogg: avoid size_t overflow in base64 decoding
* commit '
a6c650a9e7927c7d640828cea66fc96e0bf762ce':
Ogg: avoid size_t overflow in base64 decoding
Wonsik Kim [Thu, 3 Sep 2015 07:59:29 +0000 (07:59 +0000)]
am
436b32d1: am
d2605273: Ogg: avoid size_t overflow in base64 decoding
* commit '
436b32d1eb75cf20d09776549bd7f7a11fa569a1':
Ogg: avoid size_t overflow in base64 decoding
Wonsik Kim [Thu, 3 Sep 2015 07:54:01 +0000 (07:54 +0000)]
am
d2605273: Ogg: avoid size_t overflow in base64 decoding
* commit '
d26052738f7b095b7e318c8dde7f32db0a48450c':
Ogg: avoid size_t overflow in base64 decoding
Wonsik Kim [Thu, 3 Sep 2015 07:37:00 +0000 (07:37 +0000)]
Merge "Ogg: avoid size_t overflow in base64 decoding" into mnc-dev
Wonsik Kim [Wed, 2 Sep 2015 07:02:19 +0000 (16:02 +0900)]
Ogg: avoid size_t overflow in base64 decoding
Bug:
23707088
Change-Id: I8d32841fee3213c721cdcc57788807ea64d19d74
Wonsik Kim [Wed, 2 Sep 2015 07:02:19 +0000 (16:02 +0900)]
Ogg: avoid size_t overflow in base64 decoding
Bug:
23707088
Change-Id: I8d32841fee3213c721cdcc57788807ea64d19d74
Robert Shih [Wed, 2 Sep 2015 23:46:59 +0000 (16:46 -0700)]
Zero out return values in audio binder calls
More specifically when handling GET_OUTPUT_FOR_ATTR in IAudioPolicyService.
This prevents leaking a uninitialized `output` across binder if
getOutputForAttr were to encounter errors.
Bug:
23756261
Change-Id: Ibff8a1249a4e8a3c89a33a540dda428b10d6ca82
Robert Shih [Wed, 2 Sep 2015 23:46:59 +0000 (16:46 -0700)]
Zero out return values in media binder calls
More specifically when handling:
* GET_STREAM_VOLUME in IAudioPolicyService, and
* GET_CURRENT_POSITION and GET_DURATION in IMediaPlayer
This prevents leaking uninitialized values across binder in error cases.
Bug:
23756261
Change-Id: I0ffd900ab12b685b0611259ade4a3efb1ec5defe
Andy Hung [Tue, 1 Sep 2015 20:07:56 +0000 (20:07 +0000)]
Make IEffect command more robust (second try)
Bug:
23540907
Change-Id: If30cfa535ad51521053706fc40fc98d893db5bc7
(cherry picked from commit
10e6660cc5da65b027c90489ba7ac55d1504e012)
Lajos Molnar [Wed, 2 Sep 2015 17:42:40 +0000 (17:42 +0000)]
Merge "stagefright: MPEG4Extractor: allow 'hdlr' box before first track" into mnc-dev
Chien-Yu Chen [Tue, 1 Sep 2015 21:16:44 +0000 (14:16 -0700)]
Camera: Fix flashlight deadlock
Use a dedicated mutex for torch UID map so it won't cause a deadlock
after flashlight app gets killed while the torch is on.
Bug:
23722318
Change-Id: I228377aa0412052d56b6b948361d9abaecbbc686
Wei Jia [Tue, 1 Sep 2015 18:14:18 +0000 (11:14 -0700)]
libstagefright: sanity check size before dereferencing pointer in Utils.cpp
Also remove some CHECK's.
Bug:
23680780
Change-Id: I62d0941e203e40209fa6fbe3f923f3efdc5a6c23
Lajos Molnar [Tue, 1 Sep 2015 00:19:52 +0000 (17:19 -0700)]
stagefright: MPEG4Extractor: allow 'hdlr' box before first track
Bug:
21725583
Change-Id: I799c1967759c7e49fb50281a1708188450caac77
Marco Nelissen [Thu, 27 Aug 2015 20:49:32 +0000 (13:49 -0700)]
Fix timedtext parsing
Add bounds checking and fix other bugs.
Bug:
23284974
Bug:
23541506
Bug:
23542351
Bug:
23542352
Change-Id: I53551efdf109ce1833e0c361efaf4cee7a851023
Jeff Tinker [Fri, 28 Aug 2015 23:34:26 +0000 (23:34 +0000)]
Merge "Fix for security vulnerability in media server" into mnc-dev
Andy Hung [Fri, 28 Aug 2015 22:07:09 +0000 (22:07 +0000)]
am
dbf995ce: am
6b203f06: am
66b24004: am
0ea9e276: am
184ad88d: am
fba72ab0: am
f394f121: Merge "libmedia: clear reply data for IEffect command" into klp-dev
* commit '
dbf995cecdbfcb74437cf2b6b123b10821371f82':
libmedia: clear reply data for IEffect command
Andy Hung [Fri, 28 Aug 2015 21:56:32 +0000 (21:56 +0000)]
am
6b203f06: am
66b24004: am
0ea9e276: am
184ad88d: am
fba72ab0: am
f394f121: Merge "libmedia: clear reply data for IEffect command" into klp-dev
* commit '
6b203f06b969ba92181dbf781544b40cc2c41b7c':
libmedia: clear reply data for IEffect command
Andy Hung [Fri, 28 Aug 2015 21:48:10 +0000 (21:48 +0000)]
am
66b24004: am
0ea9e276: am
184ad88d: am
fba72ab0: am
f394f121: Merge "libmedia: clear reply data for IEffect command" into klp-dev
* commit '
66b24004345ff8a688e8548409b0b7d5a8902232':
libmedia: clear reply data for IEffect command
Andy Hung [Fri, 28 Aug 2015 21:39:52 +0000 (21:39 +0000)]
am
0ea9e276: am
184ad88d: am
fba72ab0: am
f394f121: Merge "libmedia: clear reply data for IEffect command" into klp-dev
* commit '
0ea9e2761a04c4f592d854dbde2749395735fe56':
libmedia: clear reply data for IEffect command
Andy Hung [Fri, 28 Aug 2015 21:26:29 +0000 (21:26 +0000)]
am
184ad88d: am
fba72ab0: am
f394f121: Merge "libmedia: clear reply data for IEffect command" into klp-dev
* commit '
184ad88ddd6bbdf01e131e8e5b75bef5be67b29b':
libmedia: clear reply data for IEffect command
Andy Hung [Fri, 28 Aug 2015 21:16:40 +0000 (21:16 +0000)]
am
fba72ab0: am
f394f121: Merge "libmedia: clear reply data for IEffect command" into klp-dev
* commit '
fba72ab0fcf7298492dcd9e3045913435d30d3a9':
libmedia: clear reply data for IEffect command
Andy Hung [Fri, 28 Aug 2015 21:08:45 +0000 (21:08 +0000)]
am
f394f121: Merge "libmedia: clear reply data for IEffect command" into klp-dev
* commit '
f394f12167fddbc755855d06b615509517c99f14':
libmedia: clear reply data for IEffect command
Andy Hung [Fri, 28 Aug 2015 20:49:57 +0000 (20:49 +0000)]
Merge "libmedia: clear reply data for IEffect command" into klp-dev
Wei Jia [Fri, 28 Aug 2015 15:49:42 +0000 (15:49 +0000)]
Merge "NuPlayer: do not create audio decoder if the player is still in shutdown process." into mnc-dev
Nick Kralevich [Thu, 27 Aug 2015 22:27:27 +0000 (22:27 +0000)]
am
608c349d: am
4e861bf5: am
e1dc15ec: am
762c7139: am
b04cfdf5: am
d437c777: am
0981df6e: IMediaPlayer.cpp: make sure structures are initialized to 0
* commit '
608c349d611e03e0143c23c3f77ddc62b137e354':
IMediaPlayer.cpp: make sure structures are initialized to 0
Jeff Tinker [Thu, 27 Aug 2015 03:22:39 +0000 (20:22 -0700)]
Fix for security vulnerability in media server
bug:
23540426
Change-Id: Ifb12ac3350410a49ba7d81d1bde12822c3008cd5
Nick Kralevich [Thu, 27 Aug 2015 22:22:33 +0000 (22:22 +0000)]
am
4e861bf5: am
e1dc15ec: am
762c7139: am
b04cfdf5: am
d437c777: am
0981df6e: IMediaPlayer.cpp: make sure structures are initialized to 0
* commit '
4e861bf5d43eae00ae4cb8727c5a408c3728288b':
IMediaPlayer.cpp: make sure structures are initialized to 0
Nick Kralevich [Thu, 27 Aug 2015 22:15:02 +0000 (22:15 +0000)]
am
e1dc15ec: am
762c7139: am
b04cfdf5: am
d437c777: am
0981df6e: IMediaPlayer.cpp: make sure structures are initialized to 0
* commit '
e1dc15ecfaa5bbbda28647749bad51e6d18d0c79':
IMediaPlayer.cpp: make sure structures are initialized to 0
Nick Kralevich [Thu, 27 Aug 2015 22:07:00 +0000 (22:07 +0000)]
am
762c7139: am
b04cfdf5: am
d437c777: am
0981df6e: IMediaPlayer.cpp: make sure structures are initialized to 0
* commit '
762c713900bd764570c8fda4e238497200da66d6':
IMediaPlayer.cpp: make sure structures are initialized to 0
Nick Kralevich [Thu, 27 Aug 2015 21:59:43 +0000 (21:59 +0000)]
am
b04cfdf5: am
d437c777: am
0981df6e: IMediaPlayer.cpp: make sure structures are initialized to 0
* commit '
b04cfdf51746dea51d2bb2f56fe9ef789fd30bd9':
IMediaPlayer.cpp: make sure structures are initialized to 0
Nick Kralevich [Thu, 27 Aug 2015 21:51:52 +0000 (21:51 +0000)]
am
d437c777: am
0981df6e: IMediaPlayer.cpp: make sure structures are initialized to 0
* commit '
d437c77716fcf454d99b8424bb01f37643b970cc':
IMediaPlayer.cpp: make sure structures are initialized to 0
Nick Kralevich [Thu, 27 Aug 2015 21:45:45 +0000 (21:45 +0000)]
am
0981df6e: IMediaPlayer.cpp: make sure structures are initialized to 0
* commit '
0981df6e3db106bfb7a56a2b668c012fcc34dd2c':
IMediaPlayer.cpp: make sure structures are initialized to 0
Nick Kralevich [Thu, 20 Aug 2015 16:56:39 +0000 (09:56 -0700)]
IMediaPlayer.cpp: make sure structures are initialized to 0
Credit https://code.google.com/p/android/issues/detail?id=183310
Bug:
23515142
Change-Id: Idbd66fb148bd0ac1dd78f8651d0164f2a41e2427
(cherry picked from commit
b73b826cc16291b33649402497efbe0f946413bd)