summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fs_mgr: allow for zramsize to be specified as percentage of total memoryIliyan Malchev2015-05-011-1/+21
* audio: add usage "virtual source" to audio attributes.Eric Laurent2014-12-091-0/+1
* audio: new stream typesEric Laurent2014-11-241-4/+8
* sdcard: mount sdcard with the noexec optionDaisuke Okitsu2014-11-241-1/+1
* logd: throttle SELinux denials to 20/secNick Kralevich2014-11-193-22/+13
* Introduce "adb keygen"Nick Kralevich2014-11-143-3/+34
* Merge "Convert futex to cond wait." into lmp-mr1-devChristopher Ferris2014-11-144-24/+60
|\
| * Convert futex to cond wait.Christopher Ferris2014-11-134-24/+60
* | Merge "property_service: Added vendor build properties to load_all_props" int...Daniel Rosenberg2014-11-141-0/+1
|\ \
| * | property_service: Added vendor build properties to load_all_propsDaniel Rosenberg2014-11-131-0/+1
| |/
* | DO NOT MERGE: Do not mount devices with invalid verity metadataSami Tolvanen2014-11-131-1/+3
* | DO NOT MERGE: Switch fs_mgr to use SHA-256 instead of SHA-1Sami Tolvanen2014-11-131-3/+3
|/
* fs_mgr: let fsck.f2fs actually attempt a fixJP Abgrall2014-11-081-1/+2
* Fix adb/fastboot windows compilations.Christopher Ferris2014-11-065-2/+11
* Ensure /data/adb existsNick Kralevich2014-11-051-0/+2
|\
| * Ensure /data/adb existsNick Kralevich2014-11-051-0/+2
* | Merge "Fix native_handle_create to check if malloc fails" into lmp-mr1-devMichael Lentine2014-11-031-3/+5
|\ \
| * | Fix native_handle_create to check if malloc failsMichael Lentine2014-11-031-3/+5
* | | am 4b970895: am 5bd96311: DO NOT MERGE Restore libcorkscrew unwinding. autome...Christopher Ferris2014-11-030-0/+0
|\ \ \ | | |/ | |/|
| * | am 5bd96311: DO NOT MERGE Restore libcorkscrew unwinding. automerge: 5a69c1d ...Christopher Ferris2014-11-030-0/+0
| |\ \
| | * \ DO NOT MERGE Restore libcorkscrew unwinding. automerge: 5a69c1d -s oursChristopher Ferris2014-11-030-0/+0
| | |\ \
| | | * \ DO NOT MERGE Restore libcorkscrew unwinding.Christopher Ferris2014-10-240-0/+0
| | | |\ \
* | | | \ \ am a18bcfa4: am 91ce3576: resolve merge conflicts of 290efd2 to klp-modular-d...Christopher Ferris2014-11-030-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 91ce3576: resolve merge conflicts of 290efd2 to klp-modular-dev-plus-aosp....Christopher Ferris2014-11-030-0/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | resolve merge conflicts of 290efd2 to klp-modular-dev-plus-aosp.Christopher Ferris2014-11-030-0/+0
| | |\ \ \ \ | | | |/ / /
| | | * | | resolve merge conflicts of 290efd2 to klp-modular-dev-plus-aosp.Christopher Ferris2014-10-240-0/+0
| | | |\ \ \
* | | | \ \ \ Merge "Fix debuggerd issues." into lmp-mr1-devChristopher Ferris2014-11-035-63/+56
|\ \ \ \ \ \ \
| * | | | | | | Fix debuggerd issues.Christopher Ferris2014-11-025-63/+56
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Fix mac buildNick Kralevich2014-11-032-0/+2
|/ / / / / /
* | | | | | Fix verity on system partitions larger than 2GSami Tolvanen2014-10-291-22/+26
* | | | | | Merge "Add code cache tests to libnativebridge." into lmp-mr1-devCalin Juravle2014-10-285-1/+112
|\ \ \ \ \ \
| * | | | | | Add code cache tests to libnativebridge.Calin Juravle2014-10-285-1/+112
* | | | | | | Merge "Handle code_cache dir creation in libnativebridge" into lmp-mr1-devCalin Juravle2014-10-2811-47/+313
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Handle code_cache dir creation in libnativebridgeCalin Juravle2014-10-2711-47/+313
* | | | | | | Merge "adb warns on remount when verity is enabled" into lmp-mr1-devPaul Lawrence2014-10-271-1/+33
|\ \ \ \ \ \ \
| * | | | | | | adb warns on remount when verity is enabledPaul Lawrence2014-10-271-1/+33
| |/ / / / / /
* | | | | | | toolbox: add prlimit commandIliyan Malchev2014-10-272-0/+77
|/ / / / / /
* | | | | | am 80f227c1: am 66f0d93c: Don\'t allow SUPPORTED_ABIs to be set by the native...Narayan Kamath2014-10-221-43/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 66f0d93c: Don\'t allow SUPPORTED_ABIs to be set by the native bridge.Narayan Kamath2014-10-211-43/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | Don't allow SUPPORTED_ABIs to be set by the native bridge.Narayan Kamath2014-10-211-43/+0
* | | | | | Merge "rootdir: Make trusty version readable by dumpstate" into lmp-mr1-devArve Hjønnevåg2014-10-201-0/+1
|\ \ \ \ \ \
| * | | | | | rootdir: Make trusty version readable by dumpstateArve Hjønnevåg2014-10-161-0/+1
* | | | | | | am fe963bfd: am a1ac84cd: MingW doesn\'t handle __attribute__((weak)) for Win...Adam Lesinski2014-10-201-2/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | am a1ac84cd: MingW doesn\'t handle __attribute__((weak)) for Windows PEAdam Lesinski2014-10-201-2/+1
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | MingW doesn't handle __attribute__((weak)) for Windows PEAdam Lesinski2014-10-201-2/+1
* | | | | | | Merge "Remove libsigchain from LD_PRELOADs" into lmp-mr1-devDmitriy Ivanov2014-10-201-1/+0
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Remove libsigchain from LD_PRELOADsDmitriy Ivanov2014-10-161-1/+0
* | | | | | | am 88b463a1: am 1c77bf4c: Merge "Fix windows specific behavior of FileMap" in...Xavier Ducrohet2014-10-161-1/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | am 1c77bf4c: Merge "Fix windows specific behavior of FileMap" into lmp-devXavier Ducrohet2014-10-161-1/+0
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge "Fix windows specific behavior of FileMap" into lmp-devXavier Ducrohet2014-10-161-1/+0
| | |\ \ \ \ \