summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* am fb623263: DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature fo...Mike Lockwood2011-05-041-3/+2
|\
| * DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding file...Mike Lockwood2011-05-041-3/+2
* | am 96974931: am 83ddcdf7: Add heartbeat error codes into MediaErrors.hGloria Wang2011-04-271-0/+11
|\ \ | |/
| * Add heartbeat error codes into MediaErrors.hGloria Wang2011-04-261-0/+11
* | resolved conflicts for merge of 87b3c0dc to honeycomb-plus-aospKenny Root2011-04-122-4/+33
|\ \ | |/ |/|
| * 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
* | | | | Fix for bug 4126624.Gloria Wang2011-03-241-1/+1
* | | | | Add one more field in DecryptHandle to support bug 4126624Gloria Wang2011-03-211-0/+6
* | | | | do not merge: Cherry pick change I6529695c from master to partially fix bug 4...Gloria Wang2011-03-211-0/+16
* | | | | DO NOT MERGE Send WebView the current transform and whether we're drawing a l...Romain Guy2011-03-181-0/+50
* | | | | Fix missing AOSP copyright headers for a bunch of media framework filesJames Dong2011-03-174-0/+64
* | | | | fix [4093196] Device lock up - log spam with SharedBufferStack: waitForCondit...Mathias Agopian2011-03-171-0/+3
* | | | | Modify the GL renderer's functor to pass the clip to WebViewRomain Guy2011-03-161-2/+1
* | | | | Merge "Bug 4016329 do full string comparisons" into honeycomb-mr1Glenn Kasten2011-03-151-2/+2
|\ \ \ \ \
| * | | | | Bug 4016329 do full string comparisonsGlenn Kasten2011-03-141-2/+2
* | | | | | SurfaceTextureClient: Add ISurfaceTexture getter.Jamie Gennis2011-03-141-0/+2
* | | | | | ANativeWindow: add query for the concrete type.Jamie Gennis2011-03-141-0/+15
* | | | | | For issue 4082089Gloria Wang2011-03-141-0/+7
|/ / / / /
* | | | | Merge "- Some change on the DrmManager in order to support feature request 40...Gloria Wang2011-03-141-1/+0
|\ \ \ \ \
| * | | | | - Some change on the DrmManager in order to support feature request 4082089.Gloria Wang2011-03-111-1/+0
* | | | | | Merge "Bug 3515073 Add ANativeWindow_fromSurfaceTexture" into honeycomb-mr1Glenn Kasten2011-03-111-0/+31
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Bug 3515073 Add ANativeWindow_fromSurfaceTextureGlenn Kasten2011-03-041-0/+31
* | | | | | Bug 3012968 DRM output controlGlenn Kasten2011-03-101-0/+4
* | | | | | Input improvements and bug fixes.Jeff Brown2011-03-091-5/+16
* | | | | | Merge "ANativeWindow: add queues-to-window-composer check." into honeycomb-mr1Jamie Gennis2011-03-092-1/+21
|\ \ \ \ \ \
| * | | | | | ANativeWindow: add queues-to-window-composer check.Jamie Gennis2011-03-082-1/+21
| |/ / / / /
* | | | | | Fix issue 3439872: video chat and bluetooth SCOEric Laurent2011-03-083-2/+15
* | | | | | Merge "Add support for partial invalidates in WebView Bug #3461349" into hone...Romain Guy2011-03-071-0/+1
|\ \ \ \ \ \
| * | | | | | Add support for partial invalidates in WebViewRomain Guy2011-03-071-0/+1
| |/ / / / /
* | | | | | Joystick tweaks. (DO NOT MERGE)Jeff Brown2011-03-042-2/+37
|/ / / / /
* | | | | Merge "Wake screen from external HID peripherals."Jeff Brown2011-03-021-0/+5
|\ \ \ \ \
| * | | | | Wake screen from external HID peripherals.Jeff Brown2011-03-021-0/+5
* | | | | | Merge "- To track the usage of all audio output devices - To track the curren...Gloria Wang2011-03-021-5/+13
|\ \ \ \ \ \
| * | | | | | - To track the usage of all audio output devicesGloria Wang2011-03-021-5/+13
* | | | | | | Merge "Allow optional specification of a PTS timestamp when signalling a disc...Andreas Huber2011-03-021-0/+6
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Allow optional specification of a PTS timestamp when signalling a discontinuity.Andreas Huber2011-03-021-0/+6
| |/ / / / /
* | | | | | Fade out the mouse pointer after inactivity or other events.Jeff Brown2011-03-023-0/+120
|/ / / / /
* | | | | Merge "Add support for up to 32 buffers per Surface"Mathias Agopian2011-03-011-3/+3
|\ \ \ \ \