summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* merge in jb-mr2-zeroday-release history after reset to jb-mr2-devandroid-4.3_r2The Android Automerger2013-06-120-0/+0
|\
| * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-190-0/+0
| |\
| | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-130-0/+0
| | |\
| | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-090-0/+0
| | | |\
| | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-080-0/+0
| | | | |\
| | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-070-0/+0
| | | | | |\
| | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-060-0/+0
| | | | | | |\
| | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-05-010-0/+0
| | | | | | | |\
| | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-290-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-240-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-230-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-220-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-180-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-170-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-150-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * Improve screenshot performance on some devices (DO NOT MERGE)Mathias Agopian2013-04-112-120/+131
| | | | | | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-110-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-100-0/+0
| | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-080-0/+0
| | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-040-0/+0
| | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-030-0/+0
| | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-020-0/+0
| | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-010-0/+0
| | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-03-270-0/+0
| | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-03-260-0/+0
| | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-03-250-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-03-210-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-03-200-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-03-190-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-03-180-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * am 7212ff29: am 20e154f1: Merge "Second try at adding a compatibility symbol ...Elliott Hughes2013-03-141-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-03-140-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * size IMemoryHeap properly for screenshotsMathias Agopian2013-03-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-03-130-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-03-120-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-03-110-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * When disconnecting a surface, cancel don't queue the bufferJesse Hall2013-03-071-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Defer destroying surfaces until not currentJesse Hall2013-03-071-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-03-070-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-03-060-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-03-050-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-03-040-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Revert "Change SurfaceControl setPosition to take floats"Dave Burke2013-03-012-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-02-280-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-02-270-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-02-260-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * SurfaceFlinger: fix a couple NULL fence checksJamie Gennis2013-02-251-2/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent IPCThreadState::joinThreadPool from spinning on unexpected errorJeff Tinker2013-06-111-0/+4
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [DO NOT MERGE] fix a bug where surfaceflinger and system_server could deadlockMathias Agopian2013-05-171-27/+117
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | make the warning timout of Fence::waitForever() implicit and longerMathias Agopian2013-05-167-9/+11
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /