OSDN Git Service
Wei Jia [Mon, 28 Sep 2015 18:32:23 +0000 (11:32 -0700)]
OMX: allow only secure codec to remotely call allocateBuffer.
Bug:
24310423
Change-Id: Iebcfc58b447f925ec2134898060af2ef227266a3
Wonsik Kim [Sun, 20 Sep 2015 01:00:23 +0000 (01:00 +0000)]
am
3371ce02: (-s ours) am
93c38623: am
c3708121: am
2d945b6a: am
4855cc3d: Merge "DO NOT MERGE Avoid size_t overflow in base64 decoding once again" into lmp-dev
* commit '
3371ce02b725abbd5304933862fc8e02821197c4':
DO NOT MERGE Avoid size_t overflow in base64 decoding once again
Wei Jia [Sun, 20 Sep 2015 01:00:22 +0000 (01:00 +0000)]
am
af321dc1: (-s ours) am
3b3cbeb3: am
2701ab04: am
f077abb0: am
4022477b: am
8cfd0ac4: (-s ours) am
741a3351: Merge "DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel." into klp-dev
* commit '
af321dc195b74d3c3201ec72eb44df1bc7ca433e':
DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel.
Wonsik Kim [Sun, 20 Sep 2015 01:00:21 +0000 (01:00 +0000)]
am
943f1c0c: (-s ours) am
7334b956: am
96c55282: am
d8b9218c: am
9d0497bd: am
44da08ed: (-s ours) am
b659b4c7: Merge "DO NOT MERGE fix build" into klp-dev
* commit '
943f1c0c46f7d4cd52f9d95a74ad3815ec4cea2e':
DO NOT MERGE fix build
Wonsik Kim [Sun, 20 Sep 2015 01:00:20 +0000 (01:00 +0000)]
am
358c610c: (-s ours) am
3f7ecd9b: 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 '
358c610c93270bc1fc6729b51cf710db36d5c74a':
DO NOT MERGE Avoid size_t overflow in base64 decoding once again
Wei Jia [Sun, 20 Sep 2015 01:00:18 +0000 (01:00 +0000)]
am
b9930418: am
eed3955c: am
5e46ca5a: am
3b130dbd: am
c5121002: am
c256004a: am
69ae6a87: libstagefright: fix A_Refl to return immediately when there is an error.
* commit '
b9930418b1f3c2057623915eec76f944f386e577':
libstagefright: fix A_Refl to return immediately when there is an error.
Wonsik Kim [Sun, 20 Sep 2015 00:13:36 +0000 (00:13 +0000)]
am
93c38623: am
c3708121: am
2d945b6a: am
4855cc3d: Merge "DO NOT MERGE Avoid size_t overflow in base64 decoding once again" into lmp-dev
* commit '
93c3862303d7139cd60f5811e67eeafd0f30d38a':
DO NOT MERGE Avoid size_t overflow in base64 decoding once again
Wei Jia [Sun, 20 Sep 2015 00:13:35 +0000 (00:13 +0000)]
am
3b3cbeb3: am
2701ab04: am
f077abb0: am
4022477b: am
8cfd0ac4: (-s ours) am
741a3351: Merge "DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel." into klp-dev
* commit '
3b3cbeb36d243148ab7b37e8aae5965c3f858587':
DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel.
Wonsik Kim [Sun, 20 Sep 2015 00:13:34 +0000 (00:13 +0000)]
am
7334b956: am
96c55282: am
d8b9218c: am
9d0497bd: am
44da08ed: (-s ours) am
b659b4c7: Merge "DO NOT MERGE fix build" into klp-dev
* commit '
7334b956547b4ea780f759931770be411ecdad88':
DO NOT MERGE fix build
Wonsik Kim [Sun, 20 Sep 2015 00:13:33 +0000 (00:13 +0000)]
am
3f7ecd9b: 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 '
3f7ecd9bc53869d95466b7a583e7804c86b9eeee':
DO NOT MERGE Avoid size_t overflow in base64 decoding once again
Wei Jia [Sun, 20 Sep 2015 00:13:32 +0000 (00:13 +0000)]
am
eed3955c: am
5e46ca5a: am
3b130dbd: am
c5121002: am
c256004a: am
69ae6a87: libstagefright: fix A_Refl to return immediately when there is an error.
* commit '
eed3955cb25731319444d9d17d74013c972499ab':
libstagefright: fix A_Refl to return immediately when there is an error.
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: If8ba3347c213fe7a36668c943ed264f2871ad468
Wonsik Kim [Thu, 17 Sep 2015 23:15:12 +0000 (23:15 +0000)]
am
c3708121: am
2d945b6a: am
4855cc3d: Merge "DO NOT MERGE Avoid size_t overflow in base64 decoding once again" into lmp-dev
* commit '
c37081212ab588ae9e7488312501e1182f3f8f04':
DO NOT MERGE Avoid size_t overflow in base64 decoding once again
Wei Jia [Thu, 17 Sep 2015 23:15:12 +0000 (23:15 +0000)]
am
2701ab04: am
f077abb0: am
4022477b: am
8cfd0ac4: (-s ours) am
741a3351: Merge "DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel." into klp-dev
* commit '
2701ab049d7c633b467d7bea9a62f1e33419faaf':
DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel.
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:22 +0000 (23:03 +0000)]
am
2d945b6a: am
4855cc3d: Merge "DO NOT MERGE Avoid size_t overflow in base64 decoding once again" into lmp-dev
* commit '
2d945b6a5c348953f468a2cf22254bff874d5ae1':
DO NOT MERGE Avoid size_t overflow in base64 decoding once again
Wei Jia [Thu, 17 Sep 2015 23:03:09 +0000 (23:03 +0000)]
am
f077abb0: am
4022477b: am
8cfd0ac4: (-s ours) am
741a3351: Merge "DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel." into klp-dev
* commit '
f077abb00ba4003738c3ca5c8133e2e3d22692c6':
DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel.
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.
Jeff Tinker [Thu, 17 Sep 2015 17:04:41 +0000 (17:04 +0000)]
Merge "DO NOT MERGE Fix vulnerability in mediaserver" into mnc-dev
Wei Jia [Thu, 17 Sep 2015 13:19:52 +0000 (13:19 +0000)]
Merge "IAudioFlinger: fix the missing initialization of variable to ensure no info leak when writing them to Parcel." into mnc-dev
Wei Jia [Wed, 16 Sep 2015 23:03:19 +0000 (23:03 +0000)]
am
095641df: (-s ours) am
0518125e: am
e1289226: am
dc81adaa: am
c191482e: Merge "DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel." into lmp-dev
* commit '
095641dfa56913a6c28b2ca414315b094a254b1c':
DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel.
Wonsik Kim [Wed, 16 Sep 2015 23:03:17 +0000 (23:03 +0000)]
am
3c4216e5: am
2fa6a5ad: am
4d27a468: am
92efd0c5: am
b5611b84: Merge "Revert "Avoid size_t overflow in base64 decoding once again"" into lmp-dev
* commit '
3c4216e5c76727f4af229e8b2a338e15f67e1ee9':
Revert "Avoid size_t overflow in base64 decoding once again"
Wonsik Kim [Wed, 16 Sep 2015 23:03:15 +0000 (23:03 +0000)]
am
fd92e4d3: am
c259acce: am
f7c40163: am
5f5fc26c: am
322e2dc5: Merge "Avoid size_t overflow in base64 decoding once again" into lmp-dev
* commit '
fd92e4d3e9648c520dc289f951dc7527a0424f38':
Avoid size_t overflow in base64 decoding once again
Wei Jia [Wed, 16 Sep 2015 22:48:32 +0000 (22:48 +0000)]
am
0518125e: am
e1289226: am
dc81adaa: am
c191482e: Merge "DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel." into lmp-dev
* commit '
0518125e9cb6aed25258fff1aafa156ed90d0826':
DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel.
Wonsik Kim [Wed, 16 Sep 2015 22:48:31 +0000 (22:48 +0000)]
am
2fa6a5ad: am
4d27a468: am
92efd0c5: am
b5611b84: Merge "Revert "Avoid size_t overflow in base64 decoding once again"" into lmp-dev
* commit '
2fa6a5ad06e696627b0ca495a031531ac47ddd6d':
Revert "Avoid size_t overflow in base64 decoding once again"
Wonsik Kim [Wed, 16 Sep 2015 22:48:29 +0000 (22:48 +0000)]
am
c259acce: am
f7c40163: am
5f5fc26c: am
322e2dc5: Merge "Avoid size_t overflow in base64 decoding once again" into lmp-dev
* commit '
c259acce721bdc6095ae0d5d7b35aea24f2b68c7':
Avoid size_t overflow in base64 decoding once again
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
Jeff Tinker [Wed, 16 Sep 2015 20:21:51 +0000 (13:21 -0700)]
DO NOT MERGE Fix vulnerability in mediaserver
ICrypto.cpp: ASLR bypass using DECRYPT IPC
bug:
24074485
Change-Id: I61cd77f0894140547f666a80526ebfe1ec3d2db6
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 06:38:00 +0000 (06:38 +0000)]
am
4855cc3d: Merge "DO NOT MERGE Avoid size_t overflow in base64 decoding once again" into lmp-dev
* commit '
4855cc3dd5a057f435c5ce540a844e46ea76d758':
DO NOT MERGE Avoid size_t overflow in base64 decoding once again
Wonsik Kim [Mon, 14 Sep 2015 06:30:56 +0000 (06:30 +0000)]
Merge "DO NOT MERGE Avoid size_t overflow in base64 decoding once again" into lmp-dev
Wonsik Kim [Mon, 14 Sep 2015 04:53:35 +0000 (04:53 +0000)]
Merge "NuCachedSource2: fix possible erroneous early free" into mnc-dev
Wonsik Kim [Fri, 11 Sep 2015 07:31:18 +0000 (16:31 +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.
This reverts commit
28314aef9e8a666dbb75bbd555f6566a6c991f1c.
Bug:
23707088
Change-Id: I268bd50431de5b5e579343bf1b425c42ada6daba
Wei Jia [Sat, 12 Sep 2015 09:46:17 +0000 (09:46 +0000)]
am
4022477b: am
8cfd0ac4: (-s ours) am
741a3351: Merge "DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel." into klp-dev
* commit '
4022477b7c1e809d4ea31c47ae42555255a4ea4d':
DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel.
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.
Wei Jia [Sat, 12 Sep 2015 08:49:21 +0000 (08:49 +0000)]
am
8cfd0ac4: (-s ours) am
741a3351: Merge "DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel." into klp-dev
* commit '
8cfd0ac4b05f3151f1083564f46f05b5f525af8a':
DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel.
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 14:10:14 +0000 (14:10 +0000)]
am
741a3351: Merge "DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel." into klp-dev
* commit '
741a335126a562ae8f5883cc0b02ba72f40e56f3':
DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel.
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
Wei Jia [Fri, 11 Sep 2015 13:54:59 +0000 (13:54 +0000)]
Merge "DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel." into klp-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
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 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)
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)
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 [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
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 [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)
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)
OSDN Git Service
