summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add NFC host-based card emulation feature.Martijn Coenen2013-07-221-0/+21
* move services executables sources in their respective src folderMathias Agopian2013-07-229-67/+52
* Merge changes Ic45929f3,Ic63f4f96,I1e703d36,I691f9507Mathias Agopian2013-07-2029-441/+212
|\
| * make sure to reset the framenumber when a buffer is marked FREEMathias Agopian2013-07-191-0/+3
| * Make ANW.setSwapInterval(0) work againMathias Agopian2013-07-1910-75/+113
| * BuffferQueue disconnect is now always asynchrnousMathias Agopian2013-07-183-78/+36
| * BufferQueue improvements and APIs changesMathias Agopian2013-07-1830-324/+96
* | Merge "Add input device property for buttons under touchpads"Michael Wright2013-07-192-0/+6
|\ \ | |/ |/|
| * Add input device property for buttons under touchpadsMichael Wright2013-07-112-0/+6
* | Merge "Follow framework change to track started ops by proc."Dianne Hackborn2013-07-183-9/+49
|\ \
| * | Follow framework change to track started ops by proc.Dianne Hackborn2013-07-173-9/+49
* | | Merge "Clarify some android-specific OMX extensions for native buffers."Lajos Molnar2013-07-171-4/+12
|\ \ \ | |/ / |/| |
| * | Clarify some android-specific OMX extensions for native buffers.Lajos Molnar2013-07-171-4/+12
* | | am 082fc1ca: am ae961022: Merge "EGL: Fix error for eglCreateWindowSurface"Jesse Hall2013-07-171-1/+1
|\ \ \
| * \ \ am ae961022: Merge "EGL: Fix error for eglCreateWindowSurface"Jesse Hall2013-07-171-1/+1
| |\ \ \
| | * \ \ Merge "EGL: Fix error for eglCreateWindowSurface"Jesse Hall2013-07-171-1/+1
| | |\ \ \
| | | * | | EGL: Fix error for eglCreateWindowSurfaceJonathan Hamilton2013-07-171-1/+1
| | |/ / /
* | | | | am 384f55ff: (-s ours) Merge "Tweaks for forward compatibility" into stage-ao...Jean-Baptiste Queru2013-07-160-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Tweaks for forward compatibility" into stage-aosp-masterJean-Baptiste Queru2013-07-162-0/+10
| |\ \ \ \
| | * | | | Tweaks for forward compatibilityJean-Baptiste Queru2013-07-162-0/+10
* | | | | | Fix build -- update for function signature changeJesse Hall2013-07-161-1/+1
* | | | | | Merge "Rewrite VirtualDisplaySurface"Jesse Hall2013-07-169-21/+591
|\ \ \ \ \ \
| * | | | | | Rewrite VirtualDisplaySurfaceJesse Hall2013-07-159-21/+591
* | | | | | | always pass the BufferQueue explicitely to consumersYing Wang2013-07-151-1/+2
* | | | | | | Merge "always pass the BufferQueue explicitely to consumers"Mathias Agopian2013-07-1613-28/+39
|\ \ \ \ \ \ \
| * | | | | | | always pass the BufferQueue explicitely to consumersMathias Agopian2013-07-1213-28/+39
* | | | | | | | Merge "Completely remove skia dependency from libinput."Jeff Brown2013-07-163-27/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | Completely remove skia dependency from libinput.Jeff Brown2013-07-153-27/+18
* | | | | | | | | Merge "Add a keycode to switch audio tracks (2/2)"michaelwr2013-07-163-0/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add a keycode to switch audio tracks (2/2)Jaekyun Seok2013-07-123-0/+4
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge "Fix issue #9860494: Waiting for service batteryinfo..."Dianne Hackborn2013-07-161-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix issue #9860494: Waiting for service batteryinfo...Dianne Hackborn2013-07-151-1/+1
* | | | | | | | | | Merge "Fix PDK build."Jeff Brown2013-07-163-43/+61
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Fix PDK build.Jeff Brown2013-07-153-43/+61
* | | | | | | | | | Merge "Change legacy "persona" references to userid_t."Jeff Sharkey2013-07-165-67/+65
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Change legacy "persona" references to userid_t.Jeff Sharkey2013-07-155-67/+65
| |/ / / / / / / /
* | | | | | | | | Add skeleton of input flinger.Jeff Brown2013-07-158-0/+346
* | | | | | | | | Make getCallingUid/Pid const.Jeff Brown2013-07-152-4/+4
* | | | | | | | | Merge "dumpstate: Show SELinux process labels"Nick Kralevich2013-07-151-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | dumpstate: Show SELinux process labelsNick Kralevich2013-07-151-0/+1
| |/ / / / / / / /
* | | | | | | | | am 65752b2b: (-s ours) Reconcile with jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-07-150-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | / / / / | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Reconcile with jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-07-150-0/+0
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ merge in jb-mr2-zeroday-release history after reset to jb-mr2-devThe Android Automerger2013-07-150-0/+0
| | |\ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ Merge "SurfaceFlinger: EventThread: Fix Vsync array size."Jesse Hall2013-07-121-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | SurfaceFlinger: EventThread: Fix Vsync array size.Saurabh Shah2013-07-121-1/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | resolved conflicts for merge of 00aea5c5 to masterMathias Agopian2013-07-126-31/+38
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | am ac9a96da: fix a dead-lock in sensorserviceMathias Agopian2013-07-126-31/+38
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | fix a dead-lock in sensorserviceMathias Agopian2013-07-126-31/+38
* | | | | | | | | Fix cmd line arguments for usagestats.Dianne Hackborn2013-07-121-1/+1
| |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | am 9201798c: (-s ours) Reconcile with jb-mr2-zeroday-release - do not mergeThe Android Open Source Project2013-07-110-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /