summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to b1982b75c4f3d9c812d9c49ca2941...The Android Automerger2014-09-220-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/ / /
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | merge in lmp-mr1-release history after reset to b1982b75c4f3d9c812d9c49ca2941...The Android Automerger2014-09-220-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/ / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SurfaceFlinger: Do less work when using PTSDan Stoza2014-11-175-24/+90
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Issue #17551667: Voice interaction service should be disabled..." into...Dianne Hackborn2014-11-172-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue #17551667: Voice interaction service should be disabled...Dianne Hackborn2014-11-142-2/+2
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add XML files for new camera2 hardware features" into lmp-mr1-devYin-Chia Yeh2014-11-142-0/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add XML files for new camera2 hardware featuresYin-Chia Yeh2014-11-132-0/+42
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix build.Narayan Kamath2014-11-141-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "implement asString() for OMX enumerations used by framework" into lmp-...Lajos Molnar2014-11-1411-1309/+2249
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | implement asString() for OMX enumerations used by frameworkLajos Molnar2014-11-1211-1309/+2249
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix issue #18356768: some app process may hang at Runtime#exit...Dianne Hackborn2014-11-133-25/+22
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add tracking of parcel memory allocations." into lmp-mr1-devDianne Hackborn2014-11-124-4/+67
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add tracking of parcel memory allocations.Dianne Hackborn2014-11-114-4/+67
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Stop consuming input on error dialogs." into lmp-mr1-devCraig Mautner2014-11-122-31/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stop consuming input on error dialogs.Craig Mautner2014-11-112-31/+0
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add an installd command to mark the end of boot." into lmp-mr1-devNarayan Kamath2014-11-113-0/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an installd command to mark the end of boot.Narayan Kamath2014-11-103-0/+22
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Frameworks/native: Fix unused parameter warningAndreas Gampe2014-11-081-1/+1
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add a timeout for releasing SensorService wake_lock." into lmp-mr1-devAravind Akella2014-11-072-30/+102
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Add a timeout for releasing SensorService wake_lock.Aravind Akella2014-11-012-30/+102
| | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-devDan Stoza2014-11-0723-38/+99
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Add a BufferItem parameter to onFrameAvailableDan Stoza2014-11-0723-38/+99
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "installd: Set priority to background for dexopting" into lmp-mr1-devIgor Murashkin2014-11-061-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | installd: Set priority to background for dexoptingIgor Murashkin2014-11-051-0/+5
| | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add missing secure stop methods" into lmp-mr1-devJeff Tinker2014-11-061-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | Add missing secure stop methodsJeff Tinker2014-10-311-0/+2
| |/ / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix for corruption when numFds or numInts is too large." into lmp-mr1-devMichael Lentine2014-11-051-1/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | Fix for corruption when numFds or numInts is too large.Michael Lentine2014-11-031-1/+16
| | |/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | dumpstate: report device uptime mmc performanceMark Salyzyn2014-11-041-0/+1
* | | | | | | | | | | | | | | | | | | | | | | | | Revert "Add more logging for dup(fd) failure"Jesse Hall2014-11-041-15/+3
* | | | | | | | | | | | | | | | | | | | | | | | | Revert "Parcel: extra validation/debug code for writeDupFileDescriptor"Jesse Hall2014-11-041-25/+0
* | | | | | | | | | | | | | | | | | | | | | | | | Revert "bufferqueue: workaround: allow NULL fence with queueBuffer"Jesse Hall2014-11-041-6/+1
| |_|_|/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | sf: Add a NULL check in getDisplayConfigsNaseer Ahmed2014-11-031-0/+3
|/ / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge "Fix crash when user provides large values in the Parcel." into lmp-mr1...Michael Lentine2014-10-312-4/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Fix crash when user provides large values in the Parcel.Michael Lentine2014-10-312-4/+18
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix output of pointers for 64bit devices." into lmp-mr1-devMichael Lentine2014-10-311-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | Fix output of pointers for 64bit devices.Michael Lentine2014-10-311-2/+2
| |/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Merge "surfaceflinger: fix -Wunused-parameter warning" into lmp-mr1-devJesse Hall2014-10-311-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | surfaceflinger: fix -Wunused-parameter warningJesse Hall2014-10-311-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | Merge "surfaceflinger: fix -Wsign-compare warnings" into lmp-mr1-devJesse Hall2014-10-311-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | surfaceflinger: fix -Wsign-compare warningsJesse Hall2014-10-311-3/+3
* | | | | | | | | | | | | | | | | | | | | | | | Merge "surfaceflinger: fix -Woverloaded-virtual warning" into lmp-mr1-devJesse Hall2014-10-311-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | surfaceflinger: fix -Woverloaded-virtual warningJesse Hall2014-10-311-2/+2
* | | | | | | | | | | | | | | | | | | | | | | | Merge "surfaceflinger: fix -Wmismatched-tags warnings" into lmp-mr1-devJesse Hall2014-10-313-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / | | / / / / / / / / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | surfaceflinger: fix -Wmismatched-tags warningsJesse Hall2014-10-313-3/+3
* | | | | | | | | | | | | | | | | | | | | | | Merge "Initialize ARect fields in default ctor" into lmp-mr1-devDan Stoza2014-10-291-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Initialize ARect fields in default ctorDmitriy Ivanov2014-10-281-0/+1
| |/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | GLConsumer: correct EGL_NO_DISPLAY to EGL_NO_CONTEXTJesse Hall2014-10-291-1/+1
* | | | | | | | | | | | | | | | | | | | | | Don't run large virtual displays through HWCDan Stoza2014-10-282-1/+22
|/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | atrace: fix Sync Manager tracing preventing enabling of kernel sync tracingPatrick Auchter2014-10-271-1/+1
|/ / / / / / / / / / / / / / / / / / / /