summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge ""#warning" conflict with -Werror"android-n-preview-1Dan Stoza2016-03-031-1/+0
|\
| * "#warning" conflict with -WerrorZhiquan Liu2016-03-031-1/+0
|/
* Merge "Allocate buffers locally in systems without SurfaceFlinger"Christopher Wiley2016-02-172-2/+25
|\
| * Allocate buffers locally in systems without SurfaceFlingerChristopher Wiley2016-02-162-2/+25
* | Merge "libbinder: add getters for PersistableBundle keys"Samuel Tan2016-02-162-11/+82
|\ \
| * | libbinder: add getters for PersistableBundle keysSamuel Tan2016-02-122-11/+82
* | | Merge "Fix -Wgnu-designator warnigns in cmds/flatland/Main.cpp"Aurimas Liutikas2016-02-161-6/+6
|\ \ \ | |_|/ |/| |
| * | Fix -Wgnu-designator warnigns in cmds/flatland/Main.cppAurimas Liutikas2016-02-161-6/+6
|/ /
* | Merge "Replace AppOpsManager locking with std::lock_guard"Christopher Wiley2016-02-161-2/+2
|\ \
| * | Replace AppOpsManager locking with std::lock_guardChristopher Wiley2016-02-121-2/+2
* | | Merge "Add missing liblog dependency"Dimitry Ivanov2016-02-131-0/+1
|\ \ \ | |/ / |/| |
| * | Add missing liblog dependencyDimitry Ivanov2016-02-121-0/+1
|/ /
* | Merge "Don't rely on AppOpsManager in systems without applications"Christopher Wiley2016-02-121-4/+28
|\ \
| * | Don't rely on AppOpsManager in systems without applicationsChristopher Wiley2016-02-051-4/+28
* | | Merge "Fix race in AppOpsManager client library"Christopher Wiley2016-02-121-1/+2
|\ \ \ | |/ / | | / | |/ |/|
| * Fix race in AppOpsManager client libraryChristopher Wiley2016-02-051-1/+2
* | Merge "libbinder: Allow readByteVector to take uint8_t"Casey Dahlin2016-02-112-21/+75
|\ \
| * | libbinder: Allow readByteVector to take uint8_tCasey Dahlin2016-02-092-21/+75
* | | Merge "dumpstate: Continued build breakage"Mark Salyzyn2016-02-102-5/+5
|\ \ \ | |/ / |/| |
| * | dumpstate: Continued build breakageMark Salyzyn2016-02-102-5/+5
|/ /
* | Merge changes I6b499f53,If821ed21Mark Salyzyn2016-02-094-29/+192
|\ \
| * | dumpstate: report process timesMark Salyzyn2016-02-094-12/+135
| * | Add option to #define _DUMPSTATE_DRY_RUN_ to skip the actual dumps.Felipe Leme2016-02-093-17/+57
|/ /
* | Merge "Enable wildcard in the list of kernel functions"John Reck2016-02-061-7/+9
|\ \
| * | Enable wildcard in the list of kernel functionsThomas Buhot2016-02-051-7/+9
* | | Merge "dumpstate: refine calculated eMMC performance values"Mark Salyzyn2016-02-051-13/+127
|\ \ \
| * | | dumpstate: refine calculated eMMC performance valuesMark Salyzyn2016-02-051-13/+127
|/ / /
* | | Merge "system_server BINDER_TYPE_FD driver ashmem accessors"Mark Salyzyn2016-02-051-2/+30
|\ \ \ | |/ / |/| |
| * | system_server BINDER_TYPE_FD driver ashmem accessorsMark Salyzyn2016-02-031-2/+30
* | | Merge "Binder::Status: Add operator<< to help with gtest logging"Eino-Ville Talvala2016-02-051-0/+7
|\ \ \ | |/ / |/| |
| * | Binder::Status: Add operator<< to help with gtest loggingEino-Ville Talvala2016-02-041-0/+7
* | | Merge "Fix typo from last commit."Dan Albert2016-02-031-2/+2
|\ \ \
| * | | Fix typo from last commit.Dan Albert2016-02-021-2/+2
|/ / /
* | | Merge "Clean up warnings in inputflinger."Dan Albert2016-02-033-5/+5
|\ \ \
| * | | Clean up warnings in inputflinger.Dan Albert2016-02-023-5/+5
| | |/ | |/|
* | | Merge "Clean up warnings in EGL."Dan Albert2016-02-033-3/+5
|\ \ \ | |/ / |/| |
| * | Clean up warnings in EGL.Dan Albert2016-02-023-3/+5
|/ /
* | Merge "Binder: Add log output in IPCThreadState::self()"Andreas Gampe2016-02-011-2/+8
|\ \
| * | Binder: Add log output in IPCThreadState::self()Andreas Gampe2016-02-011-2/+8
| |/
* | Merge "Add support for decoding UTF16 to UTF8"Christopher Wiley2016-02-012-0/+103
|\ \ | |/ |/|
| * Add support for decoding UTF16 to UTF8Christopher Wiley2016-01-292-0/+103
* | Merge "Application image support for installd DO NOT MERGE"Mathieu Chartier2016-01-281-4/+51
|\ \
| * | Application image support for installd DO NOT MERGEMathieu Chartier2016-01-281-4/+51
|/ /
* | Merge "system_server BINDER_TYPE_FD sockets using ashmem accessors"Mark Salyzyn2016-01-271-5/+14
|\ \
| * | system_server BINDER_TYPE_FD sockets using ashmem accessorsMark Salyzyn2016-01-271-5/+14
|/ /
* | Merge changes I4ebccfd0,I3507bdfd,Iaf02f55cMark Salyzyn2016-01-271-18/+17
|\ \ | |/ |/|
| * Parcel: file descriptor leakMark Salyzyn2016-01-271-4/+4
| * Parcel: include Android coding standardMark Salyzyn2016-01-271-12/+11
| * Parcel: LOG_TAG cleanupMark Salyzyn2016-01-271-2/+2
|/
* Merge "Revert "dumpstate: Add security log dump""Mark Salyzyn2016-01-261-2/+1
|\