summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* merge in lmp-release history after reset to afe2b1fadd29149ceed639357e44e06e9...studio-master-dev_before_26911779studio-1.5studio-1.4gradle_1.5.0gradle_1.3.1gradle_1.3.0-beta4gradle_1.3.0-beta3gradle_1.3.0-beta2gradle_1.3.0-beta1gradle_1.2.3gradle_1.2.2gradle_1.2.1gradle_1.2.0-rc1gradle_1.2.0-beta1gradle_1.2.0gradle_1.1.3gradle_1.1.2gradle_1.1.1gradle_1.1.0-rc3gradle_1.1.0-rc2gradle_1.1.0-rc1gradle_1.1.0android-cts-5.0_r4android-cts-5.0_r3android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1The Android Automerger2014-10-210-0/+0
|\
| * merge in lmp-release history after reset to 649bafb7ba2c3204295bc3451ff7af7e2...The Android Automerger2014-10-210-0/+0
| |\
| | * merge in lmp-release history after reset to 0b6acb2231baed861488f2d181621272d...The Android Automerger2014-10-190-0/+0
| | |\
| | | * merge in lmp-release history after reset to 60fd3feecab4336d964ca8e31c7c3220e...The Android Automerger2014-10-160-0/+0
| | | |\
| | | | * merge in lmp-release history after reset to 3454f123d0a10bd0ce0760828996aa26c...The Android Automerger2014-10-150-0/+0
| | | | |\
| | | | | * merge in lmp-release history after reset to 3454f123d0a10bd0ce0760828996aa26c...The Android Automerger2014-10-140-0/+0
| | | | | |\ | | | | |/ /
| | | | | * merge in lmp-release history after reset to ffb497743831ae4857b674629b58ea3c4...The Android Automerger2014-10-130-0/+0
| | | | | |\
| | | | | | * Improve ANR diagnostics.Jeff Brown2014-10-122-51/+71
| | | | | | * merge in lmp-release history after reset to 9ea09757fa63ad2a9bea9c846b51c1210...The Android Automerger2014-10-120-0/+0
| | | | | | |\
| | | | | | | * merge in lmp-release history after reset to 9ea09757fa63ad2a9bea9c846b51c1210...The Android Automerger2014-10-090-0/+0
| | | | | | | |\ | | | | | | |/ /
| | | | | | | * merge in lmp-release history after reset to 7830ef3dd0ff3749d974c2dd85a8fa59d...The Android Automerger2014-10-080-0/+0
| | | | | | | |\
| | | | | | | | * merge in lmp-release history after reset to 78639c22acfa5e56d87fd6fe8340d0835...The Android Automerger2014-10-070-0/+0
| | | | | | | | |\
| | | | | | | | | * Parcel: extra validation/debug code for writeDupFileDescriptorJesse Hall2014-10-061-0/+25
| | | | | | | | | * merge in lmp-release history after reset to a7eb4b74f74423dafd88adf94a7984ae9...The Android Automerger2014-10-060-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in lmp-release history after reset to a7eb4b74f74423dafd88adf94a7984ae9...The Android Automerger2014-10-050-0/+0
| | | | | | | | | | |\ | | | | | | | | | |/ /
| | | | | | | | | | * Surface: cancel the dequeued buffer when requestBuffer failsJesse Hall2014-10-021-0/+1
| | | | | | | | | | * add OMX_VIDEO_AVCLevel52 constantLajos Molnar2014-10-021-0/+1
| | | | | | | | | | * Add more logging for dup(fd) failureMichael Lentine2014-10-021-3/+15
| | | | | | | | | | * merge in lmp-release history after reset to lmp-devThe Android Automerger2014-10-020-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in lmp-release history after reset to 5ee2c9d20c0fbecf6b4a482eb8d8bfdf8...The Android Automerger2014-10-010-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in lmp-release history after reset to deb71b2812702318900c36b7bcfa97595...The Android Automerger2014-09-300-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in lmp-release history after reset to deb71b2812702318900c36b7bcfa97595...The Android Automerger2014-09-290-0/+0
| | | | | | | | | | | | | |\ | | | | | | | | | | | | |/ /
| | | | | | | | | | | | | * merge in lmp-release history after reset to 71e351d96b551ccdbc39b52a0c66da86c...The Android Automerger2014-09-280-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * Revert "Fix sockfd leakage in SensorService. Remove sockfd from Looper when ...Aravind Akella2014-09-261-2/+0
| | | | | | | | | | | | | | * merge in lmp-release history after reset to 728a8da14638e718ede11a7a894705524...The Android Automerger2014-09-250-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * merge in lmp-release history after reset to 5105960d49bfa86efeeea8f87c87aa96b...The Android Automerger2014-09-240-0/+0
| | | | | | | | | | | | | | | |\
* | | | | | | | | | | | | | | | | surfaceflinger: don't close fence fds after passing to queueBufferJesse Hall2014-10-211-3/+1
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge "bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MER...Jesse Hall2014-10-201-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE)Jesse Hall2014-10-191-1/+6
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Add version number to SensorService dump output.Aravind Akella2014-10-191-1/+2
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Migrate CA certificates to all usersRobin Lee2014-10-153-35/+144
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | media: add kMetadataBufferTypeGraphicBufferLajos Molnar2014-10-131-0/+18
|/ / / / / / / / / / / /
* | | | | | | | | | | | Improve ANR diagnostics.Jeff Brown2014-10-102-51/+71
|/ / / / / / / / / / /
* | | | | | | | | | | Fix broken error check in Parcel::readBlobNarayan Kamath2014-10-081-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Change ordering of memory allocation and calling Thread::run().Aravind Akella2014-10-071-2/+2
|/ / / / / / / / /
* | | | | | | | | Merge "Parcel: extra validation/debug code for writeDupFileDescriptor" into l...Jesse Hall2014-10-061-0/+25
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Parcel: extra validation/debug code for writeDupFileDescriptorJesse Hall2014-10-061-0/+25
* | | | | | | | | Merge "Fix sockfd leakage in SensorService." into lmp-devAravind Akella2014-10-034-40/+142
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Fix sockfd leakage in SensorService.Aravind Akella2014-10-024-40/+142
* | | | | | | | | Generate the SurfaceFlinger shader cache on initializationRiley Andrews2014-10-032-1/+34
* | | | | | | | | Merge "Surface: cancel the dequeued buffer when requestBuffer fails" into lmp...Jesse Hall2014-10-021-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Surface: cancel the dequeued buffer when requestBuffer failsJesse Hall2014-10-021-0/+1
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge "add OMX_VIDEO_AVCLevel52 constant" into lmp-devLajos Molnar2014-10-021-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | add OMX_VIDEO_AVCLevel52 constantLajos Molnar2014-10-011-0/+1
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge "Add more logging for dup(fd) failure" into lmp-devMichael Lentine2014-10-021-3/+15
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Add more logging for dup(fd) failureMichael Lentine2014-10-021-3/+15
| |/ / / / / / /
* | | | | | | | Merge "Accept socket connection before tracing." into lmp-devChristopher Ferris2014-10-021-3/+7
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Accept socket connection before tracing.Christopher Ferris2014-10-011-3/+7
| |/ / / / / /
* | | | | | | Merge "When eglMakeCurrent fails we need to fix the egl state." into lmp-devMichael Lentine2014-10-012-4/+12
|\ \ \ \ \ \ \
| * | | | | | | When eglMakeCurrent fails we need to fix the egl state.Michael Lentine2014-10-012-4/+12