Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge tag 'android-6.0.0_r26' into HEAD | Ricardo Cerqueira | 2015-11-05 | 19 | -338/+1973 |
|\ | |||||
| * | DO NOT MERGE Revert "am f37143d8: Merge "Cancel touches as well as pointer ge... | Michael Wright | 2015-09-22 | 2 | -22/+1 |
| * | SF: Add colorTransform to DisplayInfo | Dan Stoza | 2015-08-31 | 1 | -0/+1 |
| * | Merge commit '62ec2dd5' into mm | Michael Wright | 2015-08-07 | 2 | -1/+9 |
| |\ | |||||
| * | | Bug fix in SensorManager. | Aravind Akella | 2015-07-30 | 1 | -51/+2 |
| * | | am a29db50c: Merge "Revert "Bug fix in SensorManager."" into mnc-dev | Narayan Kamath | 2015-07-29 | 1 | -3/+1 |
| |\ \ | |||||
| * \ \ | am 2376bd68: Merge "Bug fix in SensorManager." into mnc-dev | Aravind Akella | 2015-07-29 | 1 | -1/+3 |
| |\ \ \ | |||||
| * \ \ \ | am f892f914: Merge "omx: fix structure sizes to be the same on 32 and 64-bit ... | Lajos Molnar | 2015-07-21 | 1 | -10/+18 |
| |\ \ \ \ | |||||
| * | | | | | Show charging speed on Keyguard | Adrian Roos | 2015-07-10 | 1 | -0/+1 |
| * | | | | | Merge "Cancel touches as well as pointer gestures." into mnc-dev | Michael Wright | 2015-07-09 | 16 | -279/+1981 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | am 3875698f: am e74f1557: Merge "omx: add OMX_IndexParamConsumerUsageBits" in... | Lajos Molnar | 2015-06-26 | 2 | -0/+2 |
| | |\ \ \ \ \ | |||||
| | | * \ \ \ \ | am e74f1557: Merge "omx: add OMX_IndexParamConsumerUsageBits" into mnc-dev | Lajos Molnar | 2015-06-26 | 2 | -0/+2 |
| | | |\ \ \ \ \ | |||||
| | * | | | | | | | Introduce stem keycodes for Wear | Anthony Hugh | 2015-06-24 | 2 | -1/+14 |
| | |/ / / / / / | |||||
| | * | | | | | | am 0638a4fa: Merge "libgui/SF: Propagate SECURE Layer flag changes" into mnc-dev | Dan Stoza | 2015-06-23 | 1 | -2/+2 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge commit '71997c1a' into manualmerge | Michael Wright | 2015-06-23 | 1 | -0/+2 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | am 18c77330: Merge "Add method to set action button on MotionEvent" into mnc-dev | Michael Wright | 2015-06-23 | 1 | -0/+2 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | am 8a4222a6: Merge "Add tracing header" into mnc-dev | Chris Craik | 2015-06-11 | 1 | -0/+55 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | am 037d4ca3: Merge "media: change parameters for OMX_EventOutputRendered" int... | Lajos Molnar | 2015-06-09 | 2 | -2/+14 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | am c6f30bde: libgui/SurfaceFlinger: Add getConsumerName | Dan Stoza | 2015-06-08 | 3 | -0/+9 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | am 5b36ea44: Merge "Revert "libgui: Add getConsumerName"" into mnc-dev | Dan Stoza | 2015-06-08 | 3 | -9/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | am 5b23b5bf: Merge "libgui: Add getConsumerName" into mnc-dev | Dan Stoza | 2015-06-08 | 3 | -0/+9 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | am 13b16040: Enable more flexible usage of blobs in parcels. | Jeff Brown | 2015-06-06 | 1 | -5/+17 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 9d2c5a7c: Merge "libgui: Add generation numbers to BufferQueue" into mnc-dev | Dan Stoza | 2015-06-05 | 6 | -3/+41 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 9e6d2ee0: DO NOT MERGE Remove unused ParcelFileDescriptor methods in parcel. | Tim Kilbourn | 2015-06-04 | 1 | -10/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am d910f3cf: media: rename VideoGrallocMetadata.hHandle to pHandle | Lajos Molnar | 2015-06-03 | 1 | -5/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am a8c2454d: fix build: media: add back legacy name for VideoGrallocMetadata | Lajos Molnar | 2015-06-02 | 1 | -0/+6 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am da7cbd8c: Merge "media: refine kMetadataBufferTypes" into mnc-dev | Lajos Molnar | 2015-06-02 | 2 | -29/+64 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 7e5bb370: Merge "Track camera and flashlight usage in battery stats." into... | Ruben Brunk | 2015-06-02 | 1 | -0/+12 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 041b945e: Merge "fix BufferItem flatten/unflatten alignment" into mnc-dev | Chong Zhang | 2015-05-22 | 1 | -2/+14 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit '217a04ba' into manualmerge | Adam Lesinski | 2015-05-18 | 1 | -0/+15 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 699a32bc: Merge "Refactor ConsumerBase and it\'s derived classes." into mn... | Michael Lentine | 2015-05-18 | 3 | -32/+9 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 3db36803: Merge "Add ConsumerBase::isAbandoned" into mnc-dev | John Reck | 2015-05-14 | 1 | -0/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 7c000280: Merge changes from topic \'button_actions\' into mnc-dev | Michael Wright | 2015-05-14 | 3 | -1/+17 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am c921ce26: Merge "Revert "Add new MotionEvent actions for button press and ... | Michael Wright | 2015-05-14 | 3 | -16/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am f27e6681: Merge "Add new MotionEvent actions for button press and release.... | Michael Wright | 2015-05-14 | 3 | -0/+16 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 09d561db: Merge "Fix PTS handling for buffer replacement" into mnc-dev | Dan Stoza | 2015-05-13 | 5 | -18/+13 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | resolved conflicts for merge of 91e485fa to mnc-dev-plus-aosp | Kenny Root | 2015-05-13 | 15 | -278/+1966 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | frameworks/native: document native types and enums | Johan Euphrosine | 2015-05-12 | 15 | -278/+1966 |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libgui: Hook up onFrameReplaced | Dan Stoza | 2015-05-12 | 2 | -19/+16 |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SurfaceFlinger: Fix PTS on stale buffers | Dan Stoza | 2015-04-30 | 3 | -0/+15 |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "BufferQueue: Add NATIVE_WINDOW_BUFFER_AGE query" | Dan Stoza | 2015-04-29 | 1 | -0/+4 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BufferQueue: Add NATIVE_WINDOW_BUFFER_AGE query | Dan Stoza | 2015-04-28 | 1 | -0/+4 |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libgui: Change detachNextBuffer to return sp<GB> | Dan Stoza | 2015-04-27 | 1 | -1/+1 |
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update app ops | Roman Birg | 2015-11-02 | 1 | -1/+13 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | binder: Squashed commit of MemoryHeapBaseIon | codeworkx | 2015-11-02 | 2 | -1/+74 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | native: dock battery | Jorge Ruesga | 2015-10-17 | 2 | -0/+14 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support WAKE flag in keyboard layouts | nadlabak | 2015-10-17 | 1 | -0/+1 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add GESTURE_SENSOR input source | Ethan Chen | 2015-10-17 | 1 | -0/+1 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring back support for glReadPixels screenshot path | Pawit Pornkitprasan | 2015-10-16 | 1 | -1/+2 |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | exynos4: getphys implementation on buffermanager for samsung omx | Ricardo Cerqueira | 2015-10-15 | 1 | -0/+4 |