OSDN Git Service
Wonsik Kim [Thu, 17 Sep 2015 23:15:11 +0000 (23:15 +0000)]
am
96c55282: am
d8b9218c: am
9d0497bd: am
44da08ed: (-s ours) am
b659b4c7: Merge "DO NOT MERGE fix build" into klp-dev
* commit '
96c5528258878d59a929a4b33e2e4b012197e335':
DO NOT MERGE fix build
Wonsik Kim [Thu, 17 Sep 2015 23:15:10 +0000 (23:15 +0000)]
am
976fbb0c: am
cc4aff99: am
644f4076: am
1507bbb0: (-s ours) am
1784a8db: Merge "DO NOT MERGE Avoid size_t overflow in base64 decoding once again" into klp-dev
* commit '
976fbb0c571e2ab62eb8c94fc8d1c25e888bb403':
DO NOT MERGE Avoid size_t overflow in base64 decoding once again
Wei Jia [Thu, 17 Sep 2015 23:15:09 +0000 (23:15 +0000)]
am
5e46ca5a: am
3b130dbd: am
c5121002: am
c256004a: am
69ae6a87: libstagefright: fix A_Refl to return immediately when there is an error.
* commit '
5e46ca5a301250e51e57fb7bc39b08ff1eadc748':
libstagefright: fix A_Refl to return immediately when there is an error.
Wonsik Kim [Thu, 17 Sep 2015 23:03:08 +0000 (23:03 +0000)]
am
d8b9218c: am
9d0497bd: am
44da08ed: (-s ours) am
b659b4c7: Merge "DO NOT MERGE fix build" into klp-dev
* commit '
d8b9218c4e8449fb1d87750ced7ab26a28019627':
DO NOT MERGE fix build
Wonsik Kim [Thu, 17 Sep 2015 23:03:07 +0000 (23:03 +0000)]
am
cc4aff99: am
644f4076: am
1507bbb0: (-s ours) am
1784a8db: Merge "DO NOT MERGE Avoid size_t overflow in base64 decoding once again" into klp-dev
* commit '
cc4aff9939eb49c3acbc9898cbda030b674c6d3b':
DO NOT MERGE Avoid size_t overflow in base64 decoding once again
Wei Jia [Thu, 17 Sep 2015 23:03:06 +0000 (23:03 +0000)]
am
3b130dbd: am
c5121002: am
c256004a: am
69ae6a87: libstagefright: fix A_Refl to return immediately when there is an error.
* commit '
3b130dbd985653e4ffc301bce1a63aab28ecc704':
libstagefright: fix A_Refl to return immediately when there is an error.
Wei Jia [Wed, 16 Sep 2015 22:40:47 +0000 (22:40 +0000)]
am
e1289226: am
dc81adaa: am
c191482e: Merge "DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel." into lmp-dev
* commit '
e1289226b73f4d4e209dbdb092261cc1f11167d0':
DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel.
Wonsik Kim [Wed, 16 Sep 2015 22:40:46 +0000 (22:40 +0000)]
am
4d27a468: am
92efd0c5: am
b5611b84: Merge "Revert "Avoid size_t overflow in base64 decoding once again"" into lmp-dev
* commit '
4d27a468c09bebe8c5f179af4a66882f01d55644':
Revert "Avoid size_t overflow in base64 decoding once again"
Wonsik Kim [Wed, 16 Sep 2015 22:40:45 +0000 (22:40 +0000)]
am
f7c40163: am
5f5fc26c: am
322e2dc5: Merge "Avoid size_t overflow in base64 decoding once again" into lmp-dev
* commit '
f7c401634ee821a9b04b068a7121cd5386a189f0':
Avoid size_t overflow in base64 decoding once again
Wei Jia [Wed, 16 Sep 2015 22:33:13 +0000 (22:33 +0000)]
am
dc81adaa: am
c191482e: Merge "DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel." into lmp-dev
* commit '
dc81adaa803a0691e65d7fef2c629236e08b9959':
DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel.
Wonsik Kim [Wed, 16 Sep 2015 22:33:11 +0000 (22:33 +0000)]
am
92efd0c5: am
b5611b84: Merge "Revert "Avoid size_t overflow in base64 decoding once again"" into lmp-dev
* commit '
92efd0c559d4d78880fc06544c662129fe7f6e1d':
Revert "Avoid size_t overflow in base64 decoding once again"
Wonsik Kim [Wed, 16 Sep 2015 22:33:10 +0000 (22:33 +0000)]
am
5f5fc26c: am
322e2dc5: Merge "Avoid size_t overflow in base64 decoding once again" into lmp-dev
* commit '
5f5fc26cfb4f8db965d6ded855ce60ee87ff90ac':
Avoid size_t overflow in base64 decoding once again
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 [Sat, 12 Sep 2015 09:46:16 +0000 (09:46 +0000)]
am
9d0497bd: am
44da08ed: (-s ours) am
b659b4c7: Merge "DO NOT MERGE fix build" into klp-dev
* commit '
9d0497bd4d59cec06f110b159da44fd0c20ad7c5':
DO NOT MERGE fix build
Wonsik Kim [Sat, 12 Sep 2015 09:46:15 +0000 (09:46 +0000)]
am
644f4076: am
1507bbb0: (-s ours) am
1784a8db: Merge "DO NOT MERGE Avoid size_t overflow in base64 decoding once again" into klp-dev
* commit '
644f4076dd9452ac6e5596b111ec9e6386f5d0a4':
DO NOT MERGE Avoid size_t overflow in base64 decoding once again
Wei Jia [Sat, 12 Sep 2015 09:46:14 +0000 (09:46 +0000)]
am
c5121002: am
c256004a: am
69ae6a87: libstagefright: fix A_Refl to return immediately when there is an error.
* commit '
c5121002e5988ba1be660f3fbdb2067776b079fe':
libstagefright: fix A_Refl to return immediately when there is an error.
Wonsik Kim [Sat, 12 Sep 2015 08:49:20 +0000 (08:49 +0000)]
am
44da08ed: (-s ours) am
b659b4c7: Merge "DO NOT MERGE fix build" into klp-dev
* commit '
44da08ed957157645e1c8776bb59924b1bb7f61c':
DO NOT MERGE fix build
Wonsik Kim [Sat, 12 Sep 2015 08:49:19 +0000 (08:49 +0000)]
am
1507bbb0: (-s ours) am
1784a8db: Merge "DO NOT MERGE Avoid size_t overflow in base64 decoding once again" into klp-dev
* commit '
1507bbb00e78c297b1aca01f580f529b55009f94':
DO NOT MERGE Avoid size_t overflow in base64 decoding once again
Wei Jia [Sat, 12 Sep 2015 08:49:17 +0000 (08:49 +0000)]
am
c256004a: am
69ae6a87: libstagefright: fix A_Refl to return immediately when there is an error.
* commit '
c256004a8cbf4dc1d647957243cf8be1a3c7bec4':
libstagefright: fix A_Refl to return immediately when there is an error.
Wei Jia [Sat, 12 Sep 2015 06:30:19 +0000 (06:30 +0000)]
am
c191482e: Merge "DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel." into lmp-dev
* commit '
c191482ed3dd99db08f8c3864aa1c24bf1229e5c':
DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel.
Wonsik Kim [Sat, 12 Sep 2015 06:30:11 +0000 (06:30 +0000)]
am
b5611b84: Merge "Revert "Avoid size_t overflow in base64 decoding once again"" into lmp-dev
* commit '
b5611b843918a27ff8cac096ea044f486194e673':
Revert "Avoid size_t overflow in base64 decoding once again"
Wonsik Kim [Sat, 12 Sep 2015 06:30:08 +0000 (06:30 +0000)]
am
322e2dc5: Merge "Avoid size_t overflow in base64 decoding once again" into lmp-dev
* commit '
322e2dc56b48a8a06ce90e6a42dbf4491e3efec0':
Avoid size_t overflow in base64 decoding once again
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
Wei Jia [Fri, 11 Sep 2015 13:55:30 +0000 (13:55 +0000)]
Merge "DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel." into lmp-dev
Wonsik Kim [Fri, 11 Sep 2015 07:50:35 +0000 (07:50 +0000)]
am
b659b4c7: Merge "DO NOT MERGE fix build" into klp-dev
* commit '
b659b4c7e1405056d189b44bd96036b6500dd378':
DO NOT MERGE fix build
Wonsik Kim [Fri, 11 Sep 2015 07:34:53 +0000 (07:34 +0000)]
Merge "DO NOT MERGE fix build" into klp-dev
Wonsik Kim [Fri, 11 Sep 2015 07:14:18 +0000 (16:14 +0900)]
DO NOT MERGE fix build
Bug:
23707088
Change-Id: Ib0d6cbc52710f33310d21b2eae1f243f0f8e8bca
Wonsik Kim [Fri, 11 Sep 2015 07:25:22 +0000 (07:25 +0000)]
am
1784a8db: Merge "DO NOT MERGE Avoid size_t overflow in base64 decoding once again" into klp-dev
* commit '
1784a8dbbc73b3e6033340d107b6c08478b962c8':
DO NOT MERGE Avoid size_t overflow in base64 decoding once again
Wonsik Kim [Fri, 11 Sep 2015 06:59:11 +0000 (06:59 +0000)]
Merge "Revert "Avoid size_t overflow in base64 decoding once again"" into lmp-dev
Wonsik Kim [Fri, 11 Sep 2015 06:51:10 +0000 (06:51 +0000)]
Revert "Avoid size_t overflow in base64 decoding once again"
This reverts commit
c9ac5dfdafed1c66beae090cafa97002764e0ca3.
Change-Id: Iae9707bbd8641a0bb00fcda39a20eb8b8f4f5232
Wonsik Kim [Fri, 11 Sep 2015 06:49:37 +0000 (06:49 +0000)]
Merge "Avoid size_t overflow in base64 decoding once again" into lmp-dev
Wonsik Kim [Fri, 11 Sep 2015 06:49:22 +0000 (06:49 +0000)]
Merge "DO NOT MERGE Avoid size_t overflow in base64 decoding once again" into klp-dev
Wei Jia [Thu, 10 Sep 2015 21:23:55 +0000 (21:23 +0000)]
am
69ae6a87: libstagefright: fix A_Refl to return immediately when there is an error.
* commit '
69ae6a87342d5260d8d8660accc8aa1b9367dbbe':
libstagefright: fix A_Refl to return immediately when there is an error.
Wei Jia [Wed, 9 Sep 2015 16:48:34 +0000 (09:48 -0700)]
DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel.
Bug:
23905951
Bug:
23912202
Change-Id: Id13a9d3cae2c09e7381b841e67ddfb188274d74c
(cherry picked from commit
e995e477ad59b79145200c8f1e9e13c16c682d59)
Wonsik Kim [Mon, 7 Sep 2015 06:52:27 +0000 (15:52 +0900)]
DO NOT MERGE 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
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 [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
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
(cherry picked from commit
715dcb9c90d86c1a02a0da056f3cee8875ad1230)
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: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: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)
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 [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)
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
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
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)
Andy Hung [Wed, 26 Aug 2015 23:34:33 +0000 (16:34 -0700)]
libmedia: clear reply data for IEffect command
Bug:
23540907
Change-Id: Ib89afc6b273b0eb310bbc5a1bd92b1e3d407c249
Abhishek Arya [Tue, 25 Aug 2015 16:32:47 +0000 (16:32 +0000)]
am
92aa0532: am
5e47eb95: am
35a7b54e: am
f9a51893: (-s ours) am
9a2be5d4: Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" into klp-dev
* commit '
92aa0532ab7cfd70011f70bc909249b894a840d0':
DO NOT MERGE - Fix software video decoder buffer size calculation
Wei Jia [Tue, 25 Aug 2015 16:32:46 +0000 (16:32 +0000)]
am
196a8a9f: am
c4757a87: am
b504ca53: am
3a7ff4c7: (-s ours) am
a5f50e98: DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.
* commit '
196a8a9fc741544dacdced22734d8f87f581b375':
DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.
Abhishek Arya [Tue, 25 Aug 2015 16:32:45 +0000 (16:32 +0000)]
am
76b3fb29: am
4fd0696a: am
4f797b92: Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" into lmp-dev
* commit '
76b3fb292dcda8f56543be10b9e135cce117e210':
DO NOT MERGE - Fix software video decoder buffer size calculation
Wei Jia [Tue, 25 Aug 2015 16:27:08 +0000 (16:27 +0000)]
am
571d9731: Merge commit \'
c642d411\' into HEAD
* commit '
571d9731c06decc19b55617be85eb0df70fa94cb':
DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.
Abhishek Arya [Tue, 25 Aug 2015 16:26:22 +0000 (16:26 +0000)]
am
5e47eb95: am
35a7b54e: am
f9a51893: (-s ours) am
9a2be5d4: Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" into klp-dev
* commit '
5e47eb9512890ea443977d3b54125b33f8259f63':
DO NOT MERGE - Fix software video decoder buffer size calculation
Wei Jia [Tue, 25 Aug 2015 16:26:20 +0000 (16:26 +0000)]
am
c4757a87: am
b504ca53: am
3a7ff4c7: (-s ours) am
a5f50e98: DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.
* commit '
c4757a8741aa43aba2a62b5e4171dcf3a7fc65e6':
DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.
Abhishek Arya [Tue, 25 Aug 2015 16:26:19 +0000 (16:26 +0000)]
am
4fd0696a: am
4f797b92: Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" into lmp-dev
* commit '
4fd0696a8f849d80c725322739ba260421299e0b':
DO NOT MERGE - Fix software video decoder buffer size calculation
Wei Jia [Tue, 25 Aug 2015 16:10:32 +0000 (09:10 -0700)]
Merge commit '
c642d411' into HEAD
DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.
Bug:
21443020
(cherry picked from commit
760f92f8b6da9c9cf128cb18fe3c09402fdde6cd)
Change-Id: I5bc68e3e7f0278b8bbbe0ad5b87d6e8e2dbabd42
OSDN Git Service
