summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Adding an optional param to the SurfaceTexture constructor.Derek Sollenberger2011-07-291-1/+1
* DO NOT MERGE. may fix build on some version of gccMathias Agopian2011-07-271-0/+1
* am f458d5fd: Merge "Tweak for forward-compatibility"Jean-Baptiste Queru2011-06-241-0/+1
|\
| * Tweak for forward-compatibilityJean-Baptiste Queru2011-06-241-0/+1
* | am e3b05d09: Merge "Tweaks for forward-compatibility"Jean-Baptiste Queru2011-06-203-0/+4
|\ \ | |/
| * Tweaks for forward-compatibilityJean-Baptiste Queru2011-06-183-0/+4
* | am afffa8fa: fix RefBase so it retains binary-compatibility with gingerbread ...Mathias Agopian2011-06-151-7/+13
|\ \
| * | fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)Mathias Agopian2011-06-131-7/+13
* | | am c9cd2387: Merge changes I37f0f315,I8cbf6044,Ibb598931,I5262bf11 into ginge...Simon Wilson2011-05-241-1/+8
|\ \ \ | |/ / | | / | |/ |/|
| * RefBase subclasses can now decide how they want to be destroyed.Mathias Agopian2011-05-231-1/+8
* | Tweak audio APIs for better forward/backward/sideways compatibility.Jean-Baptiste Queru2011-05-121-3/+3
* | am 08d9d9a4: Merge "Runtime resource overlay, iteration 1."Kenny Root2011-04-112-4/+33
|\ \
| * | Runtime resource overlay, iteration 1.MÃ¥rten Kongstad2011-04-012-4/+33
* | | am c6b22e27: Updated JBQ\'s original SurfaceTexture stubs to make webkit MR1 ...Russell Brenner2011-03-311-0/+6
|\ \ \ | |/ /
| * | Updated JBQ's original SurfaceTexture stubs to make webkit MR1 buildableRussell Brenner2011-03-311-0/+6
* | | am 49b49f8f: Added include/private/hwui/DrawGlInfo.hRussell Brenner2011-03-311-0/+50
|\ \ \ | |/ /
| * | Added include/private/hwui/DrawGlInfo.hRussell Brenner2011-03-311-0/+50
* | | am df6410dc: Merge "Fix [3513017] in lockscreen but showing empty launcher (l...Mathias Agopian2011-03-071-14/+48
|\ \ \ | |/ / |/| / | |/
| * Fix [3513017] in lockscreen but showing empty launcher (live wallpaper) onlyMathias Agopian2011-03-071-14/+48
* | am 93552de8: Merge "stubs"Jean-Baptiste Queru2011-02-111-0/+4
|\ \
| * | stubsSteve Block2011-02-111-0/+4
* | | am a6fb375c: am 056340ac: Merge "stubs"Jean-Baptiste Queru2011-01-313-0/+88
|\ \ \ | |/ /
| * | Merge "stubs"Jean-Baptiste Queru2011-01-313-0/+88
| |\ \
| | * | stubsJean-Baptiste Queru2011-01-293-0/+88
* | | | am a30063d8: am 25eb0464: Merge "Normalize output from aapt d"Dianne Hackborn2011-01-291-0/+1
|\ \ \ \ | |/ / /
| * | | Merge "Normalize output from aapt d"Dianne Hackborn2011-01-291-0/+1
| |\ \ \ | | |/ / | |/| |
| | * | Normalize output from aapt dShachar Shemesh2011-01-041-0/+1
* | | | am 2ba92c71: do not merge bug 3370834 Cherrypick from masterJean-Michel Trivi2011-01-263-5/+10
|\ \ \ \ | | |_|/ | |/| |
| * | | do not merge bug 3370834 Cherrypick from masterJean-Michel Trivi2011-01-263-5/+10
* | | | am 239fd805: Merge "fix [3361121] hang in glClear() - device unresponsive, OT...Mathias Agopian2011-01-251-7/+1
|\ \ \ \ | |/ / /
| * | | fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)Mathias Agopian2011-01-251-7/+1
* | | | am d3fcd0a1: Merge "minor clean-up. SurfaceFlinger doesn\'t need libpixelflin...Mathias Agopian2011-01-251-1/+1
|\ \ \ \ | |/ / /
| * | | minor clean-up. SurfaceFlinger doesn't need libpixelflinger.so. (DO NOT MERGE)Mathias Agopian2011-01-251-1/+1
* | | | am 265cf2e7: Merge "Fix getSwitchState."Jeff Brown2011-01-221-0/+9
|\ \ \ \ | | |/ / | |/| |
| * | | Fix getSwitchState.Jeff Brown2011-01-191-0/+9
* | | | am 41395459: Merge "Filter virtual keys after touches. (DO NOT MERGE)" into ...Jeff Brown2011-01-181-0/+17
|\ \ \ \ | | |/ / | |/| |
| * | | Merge "Filter virtual keys after touches. (DO NOT MERGE)" into gingerbreadJeff Brown2011-01-181-0/+17
| |\ \ \
| | * | | Filter virtual keys after touches. (DO NOT MERGE)Jeff Brown2011-01-111-0/+17
* | | | | merge 83fdc69e from gingerbread - do not mergeJean-Baptiste Queru2011-01-143-62/+10
|\ \ \ \ \ | |/ / / /
| * | | | Squash commits of the following patches, cherry-picked from other branch - do...James Dong2011-01-123-62/+10
| |/ / /
* | | | am 13d1cb56: Merge "Avoid deadlock in OMX::freeNode by making sure OMXCodecOb...James Dong2011-01-101-2/+7
|\ \ \ \ | |/ / /
| * | | Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold...James Dong2011-01-101-2/+7
* | | | am 0544d059: Merge "DRM Framework bug fixes."Gloria Wang2011-01-071-0/+3
|\ \ \ \ | | |/ / | |/| |
| * | | Merge "DRM Framework bug fixes."Gloria Wang2011-01-071-0/+3
| |\ \ \ | | |_|/ | |/| |
| | * | DRM Framework bug fixes.Takeshi Aimi2010-11-301-0/+3
* | | | am ba77a3f9: Add support for the "compilation" tag in mp3, mp4 and ogg, and a...Marco Nelissen2011-01-062-0/+2
|\ \ \ \ | | |_|/ | |/| |
| * | | Add support for the "compilation" tag in mp3, mp4 and ogg, and also addMarco Nelissen2011-01-062-0/+2
* | | | am 35e8dcb9: Merge "Suppress the recording sound in the recorded video" into ...James Dong2011-01-051-2/+2
|\ \ \ \ | |/ / /
| * | | Suppress the recording sound in the recorded videoJames Dong2011-01-041-2/+2
* | | | am a2977c38: Merge changes Ie03796ae,Ide3e980a into gingerbreadMathias Agopian2010-12-072-2/+16
|\ \ \ \ | |/ / /