summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* audio policy: fix preemtible capture raceEric Laurent2015-09-223-3/+41
* am 12d4a6a2: DO NOT MERGE Avoid size_t overflow in base64 decoding once againWonsik Kim2015-09-182-93/+20
|\
| * DO NOT MERGE Avoid size_t overflow in base64 decoding once againWonsik Kim2015-09-182-93/+20
* | am dffe5cdb: Merge "DO NOT MERGE Fix vulnerability in mediaserver" into mnc-devJeff Tinker2015-09-171-1/+1
|\ \ | |/
| * 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
* | | Merge "audio policy: bind setMode() and setPhoneState() operations" into mnc-...Eric Laurent2015-09-171-1/+5
|\ \ \
| * | | audio policy: bind setMode() and setPhoneState() operationsEric Laurent2015-09-161-1/+5
* | | | am 190eca5a: Merge "IAudioFlinger: fix the missing initialization of variable...Wei Jia2015-09-171-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Merge "IAudioFlinger: fix the missing initialization of variable to ensure no...Wei Jia2015-09-171-1/+1
| |\ \ \
| | * | | IAudioFlinger: fix the missing initialization of variable to ensure no info l...Wei Jia2015-09-161-1/+1
* | | | | am 489c534b: am 095641df: (-s ours) am 0518125e: am e1289226: am dc81adaa: am...Wei Jia2015-09-160-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | am 095641df: (-s ours) am 0518125e: am e1289226: am dc81adaa: am c191482e: Me...Wei Jia2015-09-160-0/+0
| |\ \ \ \
| | * \ \ \ am 0518125e: am e1289226: am dc81adaa: am c191482e: Merge "DO NOT MERGE - IAu...Wei Jia2015-09-162-14/+28
| | |\ \ \ \
| | | * \ \ \ am e1289226: am dc81adaa: am c191482e: Merge "DO NOT MERGE - IAudioFlinger: c...Wei Jia2015-09-162-14/+28
| | | |\ \ \ \
| | | | * \ \ \ am dc81adaa: am c191482e: Merge "DO NOT MERGE - IAudioFlinger: clear config b...Wei Jia2015-09-162-14/+28
| | | | |\ \ \ \
| | | | | * \ \ \ am c191482e: Merge "DO NOT MERGE - IAudioFlinger: clear config before reading...Wei Jia2015-09-122-14/+28
| | | | | |\ \ \ \
| | | | | | * \ \ \ Merge "DO NOT MERGE - IAudioFlinger: clear config before reading it from parc...Wei Jia2015-09-112-14/+28
| | | | | | |\ \ \ \
| | | | | | | * | | | DO NOT MERGE - IAudioFlinger: clear config before reading it from parcel.Wei Jia2015-09-102-14/+28
* | | | | | | | | | | am 866a12a7: am 3c4216e5: am 2fa6a5ad: am 4d27a468: am 92efd0c5: am b5611b84:...Wonsik Kim2015-09-162-20/+93
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am 3c4216e5: am 2fa6a5ad: am 4d27a468: am 92efd0c5: am b5611b84: Merge "Rever...Wonsik Kim2015-09-162-20/+93
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | am 2fa6a5ad: am 4d27a468: am 92efd0c5: am b5611b84: Merge "Revert "Avoid size...Wonsik Kim2015-09-162-20/+93
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | am 4d27a468: am 92efd0c5: am b5611b84: Merge "Revert "Avoid size_t overflow i...Wonsik Kim2015-09-162-20/+93
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / /
| | | | * | | | | | | am 92efd0c5: am b5611b84: Merge "Revert "Avoid size_t overflow in base64 deco...Wonsik Kim2015-09-162-20/+93
| | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / /
| | | | | * | | | | | am b5611b84: Merge "Revert "Avoid size_t overflow in base64 decoding once aga...Wonsik Kim2015-09-122-20/+93
| | | | | |\ \ \ \ \ \ | | | | | | |/ / / / /
| | | | | | * | | | | Merge "Revert "Avoid size_t overflow in base64 decoding once again"" into lmp...Wonsik Kim2015-09-112-20/+93
| | | | | | |\ \ \ \ \
| | | | | | | * | | | | Revert "Avoid size_t overflow in base64 decoding once again"Wonsik Kim2015-09-112-20/+93
* | | | | | | | | | | | am 9ce18e4e: am fd92e4d3: am c259acce: am f7c40163: am 5f5fc26c: am 322e2dc5:...Wonsik Kim2015-09-160-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | / / | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| * | | | | | | | | | am fd92e4d3: am c259acce: am f7c40163: am 5f5fc26c: am 322e2dc5: Merge "Avoid...Wonsik Kim2015-09-160-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | / / | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| | * | | | | | | | am c259acce: am f7c40163: am 5f5fc26c: am 322e2dc5: Merge "Avoid size_t overf...Wonsik Kim2015-09-162-93/+20
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | am f7c40163: am 5f5fc26c: am 322e2dc5: Merge "Avoid size_t overflow in base64...Wonsik Kim2015-09-162-93/+20
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / /
| | | | * | | | | | am 5f5fc26c: am 322e2dc5: Merge "Avoid size_t overflow in base64 decoding onc...Wonsik Kim2015-09-162-93/+20
| | | | |\ \ \ \ \ \ | | | | | |/ / / / /
| | | | | * | | | | am 322e2dc5: Merge "Avoid size_t overflow in base64 decoding once again" into...Wonsik Kim2015-09-122-93/+20
| | | | | |\ \ \ \ \ | | | | | | |/ / / /
| | | | | | * | | | 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
* | | | | | | | | 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
* | | | | | | | | | am bc0daa97: Merge "IAudioFlinger: always initialize variables to ensure no i...Wei Jia2015-09-162-15/+15
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge "IAudioFlinger: always initialize variables to ensure no info leak when...Wei Jia2015-09-162-15/+15
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | IAudioFlinger: always initialize variables to ensure no info leak when writin...Wei Jia2015-09-102-15/+15
* | | | | | | | | | | am 076d7ecf: Merge "Add DUMP permission check to ResourceManagerService." int...Daniel Cashman2015-09-160-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | 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
* | | | | | | | | | | | 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
* | | | | | | | | | | | | am b26249b7: resolved conflicts for 421977ae to mnc-devWonsik Kim2015-09-150-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | resolved conflicts for 421977ae to mnc-devWonsik Kim2015-09-150-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | / / / / / / / | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | am c53328a5: am 67f36a8e: resolved conflicts for 76b704e3 to lmp-mr1-devWonsik Kim2015-09-142-8/+24
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | am 67f36a8e: resolved conflicts for 76b704e3 to lmp-mr1-devWonsik Kim2015-09-142-8/+24
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / | | | | |/| | | | | | |
| | | | * | | | | | | | resolved conflicts for 76b704e3 to lmp-mr1-devWonsik Kim2015-09-142-8/+24
| | | | |\ \ \ \ \ \ \ \ | | | | | | |_|_|/ / / / | | | | | |/| | | | | |
generated by cgit v1.1 at 2025-01-25 16:23:58 +0000