summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix BuildIan Pedowitz2015-09-181-1/+1
| | | | | | Decoders/Encoders tags were mismatched when ag/770962 was submitted Change-Id: I58654b5df172d28ac4ccebde1a615c485479a2db
* Merge "stagefright: Move google mpeg2 codec into media_codecs_google_tv.xml" ↵Lajos Molnar2015-09-182-9/+29
|\ | | | | | | into mnc-dr-dev
| * stagefright: Move google mpeg2 codec into media_codecs_google_tv.xmlSungmin Choi2015-09-172-9/+29
| | | | | | | | | | | | | | Only TV devices need to support MPEG2 decoder. Bug: 23885483 Change-Id: Ic9dd03f9433c41bda1b5b6be3285499ebfd1d0e6
* | Merge "stagefright: only pass valid framerates in msg and meta" into mnc-dr-devLajos Molnar2015-09-181-2/+2
|\ \
| * | stagefright: only pass valid framerates in msg and metaLajos Molnar2015-09-171-2/+2
| |/ | | | | | | | | Bug: 21573897 Change-Id: Ide83419fa0c92726a33bad2570321e0df2558429
* | 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
* | | Merge "audio policy: bind setMode() and setPhoneState() operations" into ↵Eric Laurent2015-09-171-1/+5
|\ \ \ | | | | | | | | | | | | mnc-dr-dev
| * | | audio policy: bind setMode() and setPhoneState() operationsEric Laurent2015-09-161-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No routing operation should be allowed between setMode() and setPhoneState() when starting a call as the audio HAL relies on a precise sequence of mode change and routing change to select the initial audio device for the call. Bug: 24083591. Change-Id: I2d5ef62c11cf7aedc2ec7ca5e5fadd7ac875afbc
* | | | 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 489c534b: am 095641df: (-s ours) am 0518125e: am e1289226: am dc81adaa: ↵Wei Jia2015-09-160-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | am c191482e: Merge "DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel." into lmp-dev * commit '489c534b3c96faca24a257a3e2afce03e800861f': DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel.
| * | | | am 095641df: (-s ours) am 0518125e: am e1289226: am dc81adaa: am c191482e: ↵Wei Jia2015-09-160-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * \ \ \ am 0518125e: am e1289226: am dc81adaa: am c191482e: Merge "DO NOT MERGE - ↵Wei Jia2015-09-162-14/+28
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IAudioFlinger: clear config before reading it from parcel." into lmp-dev * commit '0518125e9cb6aed25258fff1aafa156ed90d0826': DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel.
| | | * \ \ \ am e1289226: am dc81adaa: am c191482e: Merge "DO NOT MERGE - IAudioFlinger: ↵Wei Jia2015-09-162-14/+28
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clear config before reading it from parcel." into lmp-dev * commit 'e1289226b73f4d4e209dbdb092261cc1f11167d0': DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel.
| | | | * \ \ \ am dc81adaa: am c191482e: Merge "DO NOT MERGE - IAudioFlinger: clear config ↵Wei Jia2015-09-162-14/+28
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | before reading it from parcel." into lmp-dev * commit 'dc81adaa803a0691e65d7fef2c629236e08b9959': DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel.
| | | | | * \ \ \ am c191482e: Merge "DO NOT MERGE - IAudioFlinger: clear config before ↵Wei Jia2015-09-122-14/+28
| | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reading it from parcel." into lmp-dev * commit 'c191482ed3dd99db08f8c3864aa1c24bf1229e5c': DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel.
| | | | | | * \ \ \ Merge "DO NOT MERGE - IAudioFlinger: clear config before reading it from ↵Wei Jia2015-09-112-14/+28
| | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | parcel." into lmp-dev
| | | | | | | * | | | DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel.Wei Jia2015-09-102-14/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 23905951 Bug: 23912202 Change-Id: Id13a9d3cae2c09e7381b841e67ddfb188274d74c (cherry picked from commit e995e477ad59b79145200c8f1e9e13c16c682d59)
* | | | | | | | | | | 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 4d27a468: am 92efd0c5: am b5611b84: Merge "Revert "Avoid size_t overflow ↵Wonsik Kim2015-09-162-20/+93
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in base64 decoding once again"" into lmp-dev * commit '4d27a468c09bebe8c5f179af4a66882f01d55644': 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 9ce18e4e: am fd92e4d3: am c259acce: am f7c40163: am 5f5fc26c: am ↵Wonsik Kim2015-09-160-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | / / | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 322e2dc5: Merge "Avoid size_t overflow in base64 decoding once again" into lmp-dev * commit '9ce18e4ef797c6a117afed9889b133abcb7bf609': Avoid size_t overflow in base64 decoding once again
| * | | | | | | | | | am fd92e4d3: am c259acce: am f7c40163: am 5f5fc26c: am 322e2dc5: Merge ↵Wonsik Kim2015-09-160-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | / / | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | "Avoid size_t overflow in base64 decoding once again" into lmp-dev * commit 'fd92e4d3e9648c520dc289f951dc7527a0424f38': Avoid size_t overflow in base64 decoding once again
| | * | | | | | | | 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 f7c40163: am 5f5fc26c: am 322e2dc5: Merge "Avoid size_t overflow in ↵Wonsik Kim2015-09-162-93/+20
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | base64 decoding once again" into lmp-dev * commit 'f7c401634ee821a9b04b068a7121cd5386a189f0': 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
* | | | | | | | | Merge "AudioPolicy: don't always change ACCESSIBILITY volume" into mnc-dr-devJean-Michel Trivi2015-09-161-1/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | AudioPolicy: don't always change ACCESSIBILITY volumeJean-Michel Trivi2015-09-141-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only change the volume for AUDIO_STREAM_ACCESSIBILITY when changing the media volume. Bug 23366575 Change-Id: Ic42c726ec4d47615c20500c20e4d43cef159b3c6
* | | | | | | | | | 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
* | | | | | | | | | | am 076d7ecf: Merge "Add DUMP permission check to ResourceManagerService." ↵Daniel Cashman2015-09-160-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev * commit '076d7ecf4035f58914d4998787042bc87aa8ed36': Add DUMP permission check to ResourceManagerService.
| * | | | | | | | | | Merge "Add DUMP permission check to ResourceManagerService." into mnc-devDaniel Cashman2015-09-161-0/+9
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Add DUMP permission check to ResourceManagerService.dcashman2015-09-141-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 23999740 Change-Id: I3165404add455528b22951ba47b682a075b50087 (cherry picked from commit 014e91e471edba3f9b2c71ff6025274716b0f587)
* | | | | | | | | | | | 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
* | | | | | | | | | | | | am b26249b7: resolved conflicts for 421977ae to mnc-devWonsik Kim2015-09-150-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b26249b76ab3a449b479eebfc28032775b74e5fd': DO NOT MERGE: Protect data source access with mutex during disconnect
generated by cgit v1.1 at 2024-07-03 23:23:18 +0000