summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* am 12d4a6a2: DO NOT MERGE Avoid size_t overflow in base64 decoding once againWonsik Kim2015-09-182-93/+20
|\ | | | | | | | | * commit '12d4a6a2636f41d1ee1bc10a23df13ce09efbff6': DO NOT MERGE Avoid size_t overflow in base64 decoding once again
| * DO NOT MERGE Avoid size_t overflow in base64 decoding once againWonsik Kim2015-09-182-93/+20
| | | | | | | | | | | | | | | | Switch to foundation base64 function in OggExtractor and fix the issue there. Bug: 23707088 Change-Id: If8ba3347c213fe7a36668c943ed264f2871ad468
* | am dffe5cdb: Merge "DO NOT MERGE Fix vulnerability in mediaserver" into mnc-devJeff Tinker2015-09-171-1/+1
|\ \ | |/ | | | | | | * commit 'dffe5cdb436987a65a9010460979507c06b5c904': DO NOT MERGE Fix vulnerability in mediaserver
| * Merge "DO NOT MERGE Fix vulnerability in mediaserver" into mnc-devJeff Tinker2015-09-171-1/+1
| |\
| | * DO NOT MERGE Fix vulnerability in mediaserverJeff Tinker2015-09-161-1/+1
| | | | | | | | | | | | | | | | | | | | | ICrypto.cpp: ASLR bypass using DECRYPT IPC bug: 24074485 Change-Id: I61cd77f0894140547f666a80526ebfe1ec3d2db6
* | | am 190eca5a: Merge "IAudioFlinger: fix the missing initialization of ↵Wei Jia2015-09-171-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | variable to ensure no info leak when writing them to Parcel." into mnc-dev * commit '190eca5a52f412ceac7622107db6d393b235c3b5': IAudioFlinger: fix the missing initialization of variable to ensure no info leak when writing them to Parcel.
| * | Merge "IAudioFlinger: fix the missing initialization of variable to ensure ↵Wei Jia2015-09-171-1/+1
| |\ \ | | | | | | | | | | | | no info leak when writing them to Parcel." into mnc-dev
| | * | IAudioFlinger: fix the missing initialization of variable to ensure no info ↵Wei Jia2015-09-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | leak when writing them to Parcel. Bug: 23953967 Change-Id: I3a1d0144ba3832649e322c197ff0f03305ee7829
* | | | am 866a12a7: am 3c4216e5: am 2fa6a5ad: am 4d27a468: am 92efd0c5: am ↵Wonsik Kim2015-09-162-20/+93
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | b5611b84: Merge "Revert "Avoid size_t overflow in base64 decoding once again"" into lmp-dev * commit '866a12a7c85da35479871428e1236b1b4ff0683b': Revert "Avoid size_t overflow in base64 decoding once again"
| * | | am 3c4216e5: am 2fa6a5ad: am 4d27a468: am 92efd0c5: am b5611b84: Merge ↵Wonsik Kim2015-09-162-20/+93
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | "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"
| | * | am 2fa6a5ad: am 4d27a468: am 92efd0c5: am b5611b84: Merge "Revert "Avoid ↵Wonsik Kim2015-09-162-20/+93
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | size_t overflow in base64 decoding once again"" into lmp-dev * commit '2fa6a5ad06e696627b0ca495a031531ac47ddd6d': Revert "Avoid size_t overflow in base64 decoding once again"
| | | * \ am 92efd0c5: am b5611b84: Merge "Revert "Avoid size_t overflow in base64 ↵Wonsik Kim2015-09-162-20/+93
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | decoding once again"" into lmp-dev * commit '92efd0c559d4d78880fc06544c662129fe7f6e1d': Revert "Avoid size_t overflow in base64 decoding once again"
| | | | * \ am b5611b84: Merge "Revert "Avoid size_t overflow in base64 decoding once ↵Wonsik Kim2015-09-122-20/+93
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | again"" into lmp-dev * commit 'b5611b843918a27ff8cac096ea044f486194e673': Revert "Avoid size_t overflow in base64 decoding once again"
| | | | | * \ Merge "Revert "Avoid size_t overflow in base64 decoding once again"" into ↵Wonsik Kim2015-09-112-20/+93
| | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev
| | | | | | * | Revert "Avoid size_t overflow in base64 decoding once again"Wonsik Kim2015-09-112-20/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c9ac5dfdafed1c66beae090cafa97002764e0ca3. Change-Id: Iae9707bbd8641a0bb00fcda39a20eb8b8f4f5232
| | * | | | | | am c259acce: am f7c40163: am 5f5fc26c: am 322e2dc5: Merge "Avoid size_t ↵Wonsik Kim2015-09-162-93/+20
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | overflow in base64 decoding once again" into lmp-dev * commit 'c259acce721bdc6095ae0d5d7b35aea24f2b68c7': Avoid size_t overflow in base64 decoding once again
| | | * | | | | am 5f5fc26c: am 322e2dc5: Merge "Avoid size_t overflow in base64 decoding ↵Wonsik Kim2015-09-162-93/+20
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | once again" into lmp-dev * commit '5f5fc26cfb4f8db965d6ded855ce60ee87ff90ac': Avoid size_t overflow in base64 decoding once again
| | | | * | | | am 322e2dc5: Merge "Avoid size_t overflow in base64 decoding once again" ↵Wonsik Kim2015-09-122-93/+20
| | | | |\ \ \ \ | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit '322e2dc56b48a8a06ce90e6a42dbf4491e3efec0': Avoid size_t overflow in base64 decoding once again
| | | | | * | | Merge "Avoid size_t overflow in base64 decoding once again" into lmp-devWonsik Kim2015-09-112-93/+20
| | | | | |\ \ \ | | | | | | |/ /
| | | | | | * | Avoid size_t overflow in base64 decoding once againWonsik Kim2015-09-092-93/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch to foundation base64 function in OggExtractor and fix the issue there. Bug: 23707088 Change-Id: I999ae911177c88dc13f9ee9796ca93c5928b20b0
| | * | | | | | am c53328a5: am 67f36a8e: resolved conflicts for 76b704e3 to lmp-mr1-devWonsik Kim2015-09-142-8/+24
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c53328a55427224dd42534d2b500728e38a83ca2': DO NOT MERGE: Protect data source access with mutex during disconnect
| | | * | | | | resolved conflicts for 76b704e3 to lmp-mr1-devWonsik Kim2015-09-142-8/+24
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | | | | | | | | | | | | Change-Id: I843f6b4080b06581c52683ab4af5261e974cd7af
| | | | * | | | am f3eb8268: DO NOT MERGE: Protect data source access with mutex during ↵Robert Shih2015-09-122-8/+24
| | | | |\ \ \ \ | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | disconnect * commit 'f3eb82683a80341f5ac23057aab733a57963cab2': DO NOT MERGE: Protect data source access with mutex during disconnect
| | | | | * | | DO NOT MERGE: Protect data source access with mutex during disconnectRobert Shih2015-09-082-8/+24
| | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 23658148 Change-Id: Ic37cac7b5d166143e0b77e9919b0aaef486e4fdd
* | | | | | | am bc0daa97: Merge "IAudioFlinger: always initialize variables to ensure no ↵Wei Jia2015-09-162-15/+15
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | info leak when writing them to Parcel." into mnc-dev * commit 'bc0daa97fa04bae46e3d8fb2f1c6249da856f643': IAudioFlinger: always initialize variables to ensure no info leak when writing them to Parcel.
| * | | | | | Merge "IAudioFlinger: always initialize variables to ensure no info leak ↵Wei Jia2015-09-162-15/+15
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | when writing them to Parcel." into mnc-dev
| | * | | | | | IAudioFlinger: always initialize variables to ensure no info leak when ↵Wei Jia2015-09-102-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | writing them to Parcel. Bug: 23953967 Change-Id: Ibbe841da149038675e9e8daea76c77558bc8564b
* | | | | | | | Merge "NuPlayerRenderer: Do not drain audio during teardown" into mnc-dr-devAndy Hung2015-09-151-0/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | NuPlayerRenderer: Do not drain audio during teardownAndy Hung2015-09-111-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 23748678 Change-Id: I8b65786f25f4524e5e2e9476ecc2a4f4ab3aea9e
* | | | | | | | | Merge "NuPlayerRenderer: Do not deliver audio too soon after stop" into ↵Andy Hung2015-09-142-1/+19
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dr-dev
| * | | | | | | | | NuPlayerRenderer: Do not deliver audio too soon after stopAndy Hung2015-09-012-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For non-offloaded audio, do not deliver audio data too soon after stop when in paused mode. Otherwise the audio MixerThread will keep the track playing, instead of inactivating the track. Bug: 23167401 Change-Id: If376148c742fde2d20dc5d23bf0b894fe378e71a (cherry picked from commit b03dcb34cd44d77e5fe1559e72323e03c59931db)
* | | | | | | | | | am 4374b187: Merge "NuCachedSource2: fix possible erroneous early free" into ↵Wonsik Kim2015-09-144-7/+21
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev * commit '4374b187e5e72056f8e814dae752b62cb60fc9a4': NuCachedSource2: fix possible erroneous early free
| * | | | | | | | | Merge "NuCachedSource2: fix possible erroneous early free" into mnc-devWonsik Kim2015-09-144-7/+21
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | NuCachedSource2: fix possible erroneous early freeWonsik Kim2015-09-094-7/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | am 393eb647: Merge "Avoid size_t overflow in base64 decoding once again" ↵Wonsik Kim2015-09-112-93/+20
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev * commit '393eb6471e08dd0c2f9b8187721d02e978491cba': Avoid size_t overflow in base64 decoding once again
| * | | | | | | | | | Merge "Avoid size_t overflow in base64 decoding once again" into mnc-devWonsik Kim2015-09-112-93/+20
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Avoid size_t overflow in base64 decoding once againWonsik Kim2015-09-072-93/+20
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch to foundation base64 function in OggExtractor and fix the issue there. Bug: 23707088 Change-Id: I999ae911177c88dc13f9ee9796ca93c5928b20b0
* | | | | | | | | | Merge "libstagefright: Do not add audio codecs to resource manager. They are ↵Ronghua Wu2015-09-111-2/+5
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | too small anyhow." into mnc-dr-dev
| * | | | | | | | | libstagefright: Do not add audio codecs to resource manager. They are too ↵Ronghua Wu2015-09-101-2/+5
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | small anyhow. Bug: 23703241 Change-Id: I3c2882a1d6736bb8a4099289d8bab4974343586d
* | | | | | | | | am 7a2ffb90: Merge "IAudioFlinger: clear config before reading it from ↵Wei Jia2015-09-102-15/+29
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | parcel." into mnc-dev * commit '7a2ffb90ff8c8d6d8d32f44b8fe0f79bc608f1f1': IAudioFlinger: clear config before reading it from parcel.
| * | | | | | | | Merge "IAudioFlinger: clear config before reading it from parcel." into mnc-devWei Jia2015-09-102-15/+29
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| | * | | | | | | IAudioFlinger: clear config before reading it from parcel.Wei Jia2015-09-092-15/+29
| | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 23905951 Bug: 23912202 Change-Id: Id13a9d3cae2c09e7381b841e67ddfb188274d74c
* | | | | | | | am b946648c: Protect data source access with mutex during disconnectRobert Shih2015-09-092-8/+24
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b946648cc63a4d328318b56215214ead575bc54a': Protect data source access with mutex during disconnect
| * | | | | | | Protect data source access with mutex during disconnectRobert Shih2015-09-082-8/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 23658148 Change-Id: Ic37cac7b5d166143e0b77e9919b0aaef486e4fdd
* | | | | | | | am c336136d: Merge "libstagefright: fix A_Refl to return immediately when ↵Wei Jia2015-09-082-2/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | there is an error." into mnc-dev * commit 'c336136d8a86a8a95047949955a9bb749af247ab': libstagefright: fix A_Refl to return immediately when there is an error.
| * | | | | | | Merge "libstagefright: fix A_Refl to return immediately when there is an ↵Wei Jia2015-09-082-2/+5
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | error." into mnc-dev
| | * | | | | | libstagefright: fix A_Refl to return immediately when there is an error.Wei Jia2015-09-042-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 23609206 Change-Id: I2ad25fb208df17f5a5b6d6b356eff2f400627f22
* | | | | | | | am 35e03636: am becceb11: am b57ffbb5: am d021f7e5: am b18c0276: am ↵Robert Shih2015-09-042-3/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2b63b91b: am c1e989e7: am 13ff64c2: Merge "Zero out return values in media binder calls" into klp-dev * commit '35e03636d6fa0c7c33c67e10686657849a61aff8': Zero out return values in media binder calls
| * | | | | | | am becceb11: am b57ffbb5: am d021f7e5: am b18c0276: am 2b63b91b: am ↵Robert Shih2015-09-042-3/+3
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | am b57ffbb5: am d021f7e5: am b18c0276: am 2b63b91b: am c1e989e7: am ↵Robert Shih2015-09-042-3/+3
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 13ff64c2: Merge "Zero out return values in media binder calls" into klp-dev * commit 'b57ffbb5486a58e0dbb03466e9f3a5e51d6cf0f3': Zero out return values in media binder calls
generated by cgit v1.1 at 2024-06-08 17:15:51 +0000