Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add NFC host-based card emulation feature. | Martijn Coenen | 2013-07-22 | 1 | -0/+21 |
* | move services executables sources in their respective src folder | Mathias Agopian | 2013-07-22 | 9 | -67/+52 |
* | Merge changes Ic45929f3,Ic63f4f96,I1e703d36,I691f9507 | Mathias Agopian | 2013-07-20 | 29 | -441/+212 |
|\ | |||||
| * | make sure to reset the framenumber when a buffer is marked FREE | Mathias Agopian | 2013-07-19 | 1 | -0/+3 |
| * | Make ANW.setSwapInterval(0) work again | Mathias Agopian | 2013-07-19 | 10 | -75/+113 |
| * | BuffferQueue disconnect is now always asynchrnous | Mathias Agopian | 2013-07-18 | 3 | -78/+36 |
| * | BufferQueue improvements and APIs changes | Mathias Agopian | 2013-07-18 | 30 | -324/+96 |
* | | Merge "Add input device property for buttons under touchpads" | Michael Wright | 2013-07-19 | 2 | -0/+6 |
|\ \ | |/ |/| | |||||
| * | Add input device property for buttons under touchpads | Michael Wright | 2013-07-11 | 2 | -0/+6 |
* | | Merge "Follow framework change to track started ops by proc." | Dianne Hackborn | 2013-07-18 | 3 | -9/+49 |
|\ \ | |||||
| * | | Follow framework change to track started ops by proc. | Dianne Hackborn | 2013-07-17 | 3 | -9/+49 |
* | | | Merge "Clarify some android-specific OMX extensions for native buffers." | Lajos Molnar | 2013-07-17 | 1 | -4/+12 |
|\ \ \ | |/ / |/| | | |||||
| * | | Clarify some android-specific OMX extensions for native buffers. | Lajos Molnar | 2013-07-17 | 1 | -4/+12 |
* | | | am 082fc1ca: am ae961022: Merge "EGL: Fix error for eglCreateWindowSurface" | Jesse Hall | 2013-07-17 | 1 | -1/+1 |
|\ \ \ | |||||
| * \ \ | am ae961022: Merge "EGL: Fix error for eglCreateWindowSurface" | Jesse Hall | 2013-07-17 | 1 | -1/+1 |
| |\ \ \ | |||||
| | * \ \ | Merge "EGL: Fix error for eglCreateWindowSurface" | Jesse Hall | 2013-07-17 | 1 | -1/+1 |
| | |\ \ \ | |||||
| | | * | | | EGL: Fix error for eglCreateWindowSurface | Jonathan Hamilton | 2013-07-17 | 1 | -1/+1 |
| | |/ / / | |||||
* | | | | | am 384f55ff: (-s ours) Merge "Tweaks for forward compatibility" into stage-ao... | Jean-Baptiste Queru | 2013-07-16 | 0 | -0/+0 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge "Tweaks for forward compatibility" into stage-aosp-master | Jean-Baptiste Queru | 2013-07-16 | 2 | -0/+10 |
| |\ \ \ \ | |||||
| | * | | | | Tweaks for forward compatibility | Jean-Baptiste Queru | 2013-07-16 | 2 | -0/+10 |
* | | | | | | Fix build -- update for function signature change | Jesse Hall | 2013-07-16 | 1 | -1/+1 |
* | | | | | | Merge "Rewrite VirtualDisplaySurface" | Jesse Hall | 2013-07-16 | 9 | -21/+591 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Rewrite VirtualDisplaySurface | Jesse Hall | 2013-07-15 | 9 | -21/+591 |
* | | | | | | | always pass the BufferQueue explicitely to consumers | Ying Wang | 2013-07-15 | 1 | -1/+2 |
* | | | | | | | Merge "always pass the BufferQueue explicitely to consumers" | Mathias Agopian | 2013-07-16 | 13 | -28/+39 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | always pass the BufferQueue explicitely to consumers | Mathias Agopian | 2013-07-12 | 13 | -28/+39 |
* | | | | | | | | Merge "Completely remove skia dependency from libinput." | Jeff Brown | 2013-07-16 | 3 | -27/+18 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Completely remove skia dependency from libinput. | Jeff Brown | 2013-07-15 | 3 | -27/+18 |
* | | | | | | | | | Merge "Add a keycode to switch audio tracks (2/2)" | michaelwr | 2013-07-16 | 3 | -0/+4 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add a keycode to switch audio tracks (2/2) | Jaekyun Seok | 2013-07-12 | 3 | -0/+4 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
* | | | | | | | | | Merge "Fix issue #9860494: Waiting for service batteryinfo..." | Dianne Hackborn | 2013-07-16 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix issue #9860494: Waiting for service batteryinfo... | Dianne Hackborn | 2013-07-15 | 1 | -1/+1 |
* | | | | | | | | | | Merge "Fix PDK build." | Jeff Brown | 2013-07-16 | 3 | -43/+61 |
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Fix PDK build. | Jeff Brown | 2013-07-15 | 3 | -43/+61 |
* | | | | | | | | | | Merge "Change legacy "persona" references to userid_t." | Jeff Sharkey | 2013-07-16 | 5 | -67/+65 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Change legacy "persona" references to userid_t. | Jeff Sharkey | 2013-07-15 | 5 | -67/+65 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Add skeleton of input flinger. | Jeff Brown | 2013-07-15 | 8 | -0/+346 |
* | | | | | | | | | Make getCallingUid/Pid const. | Jeff Brown | 2013-07-15 | 2 | -4/+4 |
* | | | | | | | | | Merge "dumpstate: Show SELinux process labels" | Nick Kralevich | 2013-07-15 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | dumpstate: Show SELinux process labels | Nick Kralevich | 2013-07-15 | 1 | -0/+1 |
| |/ / / / / / / / | |||||
* | | | | | | | | | am 65752b2b: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge | The Android Open Source Project | 2013-07-15 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | / / / / | | |_|_|/ / / / | |/| | | | | | | |||||
| * | | | | | | | Reconcile with jb-mr2-zeroday-release - do not merge | The Android Open Source Project | 2013-07-15 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev | The Android Automerger | 2013-07-15 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ | |||||
* | | \ \ \ \ \ \ \ | Merge "SurfaceFlinger: EventThread: Fix Vsync array size." | Jesse Hall | 2013-07-12 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | SurfaceFlinger: EventThread: Fix Vsync array size. | Saurabh Shah | 2013-07-12 | 1 | -1/+1 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | resolved conflicts for merge of 00aea5c5 to master | Mathias Agopian | 2013-07-12 | 6 | -31/+38 |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | am ac9a96da: fix a dead-lock in sensorservice | Mathias Agopian | 2013-07-12 | 6 | -31/+38 |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||||
| | * | | | | | | | fix a dead-lock in sensorservice | Mathias Agopian | 2013-07-12 | 6 | -31/+38 |
* | | | | | | | | | Fix cmd line arguments for usagestats. | Dianne Hackborn | 2013-07-12 | 1 | -1/+1 |
| |_|_|_|/ / / / |/| | | | | | | | |||||
* | | | | | | | | am 9201798c: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge | The Android Open Source Project | 2013-07-11 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |