summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* merge in jb-mr1.1-release history after reset to jb-mr1.1-devandroid-4.2.2_r1.2android-4.2.2_r1.1android-4.2.2_r1The Android Automerger2012-12-100-0/+0
|\
| * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-12-070-0/+0
| |\
| | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-12-060-0/+0
| | |\
| | | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-11-290-0/+0
| | | |\
| | | | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-11-270-0/+0
| | | | |\
| | | | | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-11-260-0/+0
| | | | | |\
| | | | | | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-11-190-0/+0
| | | | | | |\
| | | | | | | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-11-190-0/+0
| | | | | | | |\
| | | | | | | | * workaround: don't reset compositionType to HWC_FRAMEBUFFER [DO NOT MERGE]Mathias Agopian2012-11-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This workaround a HWC HAL issue in Nexus 7, which causes videos and live wallpapers to animate slowly. Bug: 7563862 Change-Id: I16ad85317e3e7f47f005e7397357c14186b0a13d
| | | | | | | | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-11-160-0/+0
| | | | | | | | |\ | | | | | | | |/ / | | | | | | |/| |
| | | | | | | | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-11-140-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in jb-mr1.1-release history after reset to jb-mr1.1-devThe Android Automerger2012-11-060-0/+0
| | | | | | | | | |\
* | | | | | | | | | | [DO NOT MERGE] GraphicBufferAllocator: stall alloc for async freesandroid-cts-4.2_r2Jamie Gennis2012-12-101-52/+108
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes GraphicBufferAllocator::alloc wait for pending async frees to complete before attempting to allocate a gralloc buffer if there are more than 8 pending async frees. Bug: 7696861 Change-Id: I1fae86e13edefcaa153b8ce9fd057f335716059e
* | | | | | | | | | Revert "ConsumerBase: free buffers outside the lock"Jamie Gennis2012-12-071-24/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b21a4e3b5f7f07ed160ca6e1809313e2a8e2a6a4.
* | | | | | | | | | DO NOT MERGE GraphicBufferAllocator: make frees asyncJamie Gennis2012-12-072-11/+56
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes GraphicBufferAllocator::free queue a job to another thread to perform the actual free operation. This prevents potentially slow free operations from blocking rendering. Bug: 7675940 Change-Id: Id61099d66bb4c3949d04184e0d7f192ac18076b4
* | | | | | | | | ConsumerBase: free buffers outside the lockJamie Gennis2012-12-061-10/+24
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes ConsumerBase::onBuffersReleased hold a reference to all its gralloc buffers until after the mutex is unlocked. This prevents slow gralloc::free calls from causing lock contention with rendering threads. Bug: 7675940 Change-Id: I0ec805d1b612afeeecfffec03f982371d27d93be
* | | | | | | | Merge "make transform hint multi-display aware" into jb-mr1.1-devMathias Agopian2012-11-274-23/+64
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | make transform hint multi-display awareMathias Agopian2012-11-214-23/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if a layer is not mirrored, we now use its display as the source for the transfrom hint calculation instead of always using the default (main) display. this change does two thing: 1) we make updateTransformHint take a DisplayDevice as a parameter instead of hard-coding the main display. 2) each time we do a transaction that could change the hint, we go through all layers and figure out which display should be used for their transform hint. Bug: 7599344 Change-Id: I9b04a95e6c372dd770bacf81d8ef6f8e31b87b83
* | | | | | | | Merge "DO NOT MERGE - native_fence_sync: fix an enum name" into jb-mr1.1-devAndy McFadden2012-11-271-10/+11
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | DO NOT MERGE - native_fence_sync: fix an enum nameJamie Gennis2012-11-261-10/+11
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change replaces all references to the "EGL_NO_NATIVE_FENCE_ANDROID" enum with "EGL_NO_NATIVE_FENCE_FD_ANDROID". Bug: http://code.google.com/p/android/issues/detail?id=40295 (cherry-pick from master) Change-Id: Ie25d4ab9721d8b69b8d4afcf18e902ef8e3ad911
* | | | | | | gltrace: Make sure device is debuggable.Siva Velusamy2012-11-201-0/+6
| |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 6482fa4db0a7ac99cd3503d6bf170f80b26fb695) Change-Id: I205aabcab1932025c12e7ba3d1b3cf94684f6758
* | | | | | fix typo that broke all the buildsMathias Agopian2012-11-191-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7584338 Change-Id: Ieb8c27a544ac583af9aa1e0376e33a673d2d9673
* | | | | | workaround: don't reset compositionType to HWC_FRAMEBUFFER [DO NOT MERGE]Mathias Agopian2012-11-191-1/+1
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This workaround a HWC HAL issue in Nexus 7, which causes videos and live wallpapers to animate slowly. Bug: 7563862 Change-Id: I16ad85317e3e7f47f005e7397357c14186b0a13d
* | | | | fix an out-of-bounds memory accessMathias Agopian2012-11-151-4/+6
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | in this particular case, this OOB is always harmless (and that's why it didn't get fixed from MR1), however, it interfers with valgrind debugging. Change-Id: Ic977e03287e59c4b124a89146c9023bd0cb540a8
* | | | Reset compositionType to HWC_FRAMEBUFFER before calling prepare()Mathias Agopian2012-11-143-1/+5
|/ / / | | | | | | | | | | | | | | | Honor the documentation. this broke in JB-MR1. Change-Id: I841a93b409fc940374bc748c4e143d82a192669c
* | | Reduce emulator logspamAndy McFadden2012-11-082-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | The emulator doesn't support systrace, but we should point that out at most once per process. Bug 7436352 Change-Id: I06b2c1ea0df6c02c11cd2496423c337f8d7c62a1
* | | bugreport: Add /proc/interrupts dumpDmitry Shmidt2012-11-071-0/+3
| | | | | | | | | | | | | | | | | | | | | Bug: 7301178 Change-Id: Ifad3b981ac904d4637d69dfc223d5bb2c9d80bda Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | | bugreport: Add wlan FW counters dump for bcmdhdDmitry Shmidt2012-11-071-1/+5
| | | | | | | | | | | | | | | | | | | | | Bug: 7494877 Change-Id: I4d24dbcf7596777ec02ab1312c2ab996ba7688f1 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| | |
| \ \
*-. \ \ Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project2012-11-060-0/+0
|\ \ \ \ | |_|/ / |/| | | | | | | Change-Id: I219247f1b0f5d87b4144dc1535039e93fc636a94
| | * | merge in jb-mr1-release history after reset to jb-mr1-devandroid-cts-4.2_r1android-4.2_r1android-4.2.1_r1.2android-4.2.1_r1.1android-4.2.1_r1The Android Automerger2012-11-050-0/+0
| | |\ \ | |/ / / |/| | / | | |/
| | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-300-0/+0
| | |\
| | | * partially implement external display clippingMathias Agopian2012-10-251-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we perform external display clipping only on the GL side (ie: not done on the h/w composer side, which is harder and would be too risky). in practice this means that WFD will be clipped properly, while HDMI *may* or may not depending on how hwc is used. Bug: 7149437 Change-Id: I92d4d04220db72b6ffb134c7fa7a93af569723a5
| | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-250-0/+0
| | | |\
| | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-220-0/+0
| | | | |\
| | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-200-0/+0
| | | | | |\
| | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-190-0/+0
| | | | | | |\
| | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-180-0/+0
| | | | | | | |\
| | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-170-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-160-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-160-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-130-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-120-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-110-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-110-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-100-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-100-0/+0
| | | | | | | | | | | | | | | | |\
* | | | | | | | | | | | | | | | | | fix transitions from hwc to GLES compositionandroid-sdk-support_r11Mathias Agopian2012-11-051-4/+4
| |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we switched from HWC to GLES but the dirty region was empty (could happen if the dirty region is outside of the screen for instance), we need to force a full screen composition. In this change we ignore the dirty region for the purpose of rejecting the whole update and we rely on the fact that it will later be expanded to the whole screen. This was the least risky fix. Bug: 7467760, 7452931 Change-Id: I2132f2f963b00a3ce7150adadb107b0367b3862e
* | | | | | | | | | | | | | | | | dumpstate: add kernel memory fragmentation unusable indexColin Cross2012-10-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dump /d/extfrag/unusable_index in bugreports. It shows the percentage of memory in each zone that is not available for allocations for each order. Change-Id: I2af6680cb609887ea7b3d6107d1aa88bd0206b52
* | | | | | | | | | | | | | | | | partially implement external display clippingMathias Agopian2012-10-251-0/+25
| |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we perform external display clipping only on the GL side (ie: not done on the h/w composer side, which is harder and would be too risky). in practice this means that WFD will be clipped properly, while HDMI *may* or may not depending on how hwc is used. Bug: 7149437 Change-Id: I92d4d04220db72b6ffb134c7fa7a93af569723a5
* | | | | | | | | | | | | | | | Revert "Revert "put back the unused virtuals in Vector<>""Dave Burke2012-10-252-0/+39
| |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 225c66a48cdc3acef21ee380dc134449749d3cb3 Change-Id: If31a04b81052cbc7dd7bf237c07107c33066d03d