summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-6.0.0_r26' into HEADRicardo Cerqueira2015-11-0519-338/+1973
|\
| * DO NOT MERGE Revert "am f37143d8: Merge "Cancel touches as well as pointer ge...Michael Wright2015-09-222-22/+1
| * SF: Add colorTransform to DisplayInfoDan Stoza2015-08-311-0/+1
| * Merge commit '62ec2dd5' into mmMichael Wright2015-08-072-1/+9
| |\
| * | Bug fix in SensorManager.Aravind Akella2015-07-301-51/+2
| * | am a29db50c: Merge "Revert "Bug fix in SensorManager."" into mnc-devNarayan Kamath2015-07-291-3/+1
| |\ \
| * \ \ am 2376bd68: Merge "Bug fix in SensorManager." into mnc-devAravind Akella2015-07-291-1/+3
| |\ \ \
| * \ \ \ am f892f914: Merge "omx: fix structure sizes to be the same on 32 and 64-bit ...Lajos Molnar2015-07-211-10/+18
| |\ \ \ \
| * | | | | Show charging speed on KeyguardAdrian Roos2015-07-101-0/+1
| * | | | | Merge "Cancel touches as well as pointer gestures." into mnc-devMichael Wright2015-07-0916-279/+1981
| |\ \ \ \ \
| | * \ \ \ \ am 3875698f: am e74f1557: Merge "omx: add OMX_IndexParamConsumerUsageBits" in...Lajos Molnar2015-06-262-0/+2
| | |\ \ \ \ \
| | | * \ \ \ \ am e74f1557: Merge "omx: add OMX_IndexParamConsumerUsageBits" into mnc-devLajos Molnar2015-06-262-0/+2
| | | |\ \ \ \ \
| | * | | | | | | Introduce stem keycodes for WearAnthony Hugh2015-06-242-1/+14
| | |/ / / / / /
| | * | | | | | am 0638a4fa: Merge "libgui/SF: Propagate SECURE Layer flag changes" into mnc-devDan Stoza2015-06-231-2/+2
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge commit '71997c1a' into manualmergeMichael Wright2015-06-231-0/+2
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ am 18c77330: Merge "Add method to set action button on MotionEvent" into mnc-devMichael Wright2015-06-231-0/+2
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ am 8a4222a6: Merge "Add tracing header" into mnc-devChris Craik2015-06-111-0/+55
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ am 037d4ca3: Merge "media: change parameters for OMX_EventOutputRendered" int...Lajos Molnar2015-06-092-2/+14
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ am c6f30bde: libgui/SurfaceFlinger: Add getConsumerNameDan Stoza2015-06-083-0/+9
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ am 5b36ea44: Merge "Revert "libgui: Add getConsumerName"" into mnc-devDan Stoza2015-06-083-9/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ am 5b23b5bf: Merge "libgui: Add getConsumerName" into mnc-devDan Stoza2015-06-083-0/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ am 13b16040: Enable more flexible usage of blobs in parcels.Jeff Brown2015-06-061-5/+17
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 9d2c5a7c: Merge "libgui: Add generation numbers to BufferQueue" into mnc-devDan Stoza2015-06-056-3/+41
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 9e6d2ee0: DO NOT MERGE Remove unused ParcelFileDescriptor methods in parcel.Tim Kilbourn2015-06-041-10/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d910f3cf: media: rename VideoGrallocMetadata.hHandle to pHandleLajos Molnar2015-06-031-5/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am a8c2454d: fix build: media: add back legacy name for VideoGrallocMetadataLajos Molnar2015-06-021-0/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am da7cbd8c: Merge "media: refine kMetadataBufferTypes" into mnc-devLajos Molnar2015-06-022-29/+64
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7e5bb370: Merge "Track camera and flashlight usage in battery stats." into...Ruben Brunk2015-06-021-0/+12
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 041b945e: Merge "fix BufferItem flatten/unflatten alignment" into mnc-devChong Zhang2015-05-221-2/+14
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit '217a04ba' into manualmergeAdam Lesinski2015-05-181-0/+15
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 699a32bc: Merge "Refactor ConsumerBase and it\'s derived classes." into mn...Michael Lentine2015-05-183-32/+9
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 3db36803: Merge "Add ConsumerBase::isAbandoned" into mnc-devJohn Reck2015-05-141-0/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7c000280: Merge changes from topic \'button_actions\' into mnc-devMichael Wright2015-05-143-1/+17
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c921ce26: Merge "Revert "Add new MotionEvent actions for button press and ...Michael Wright2015-05-143-16/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f27e6681: Merge "Add new MotionEvent actions for button press and release....Michael Wright2015-05-143-0/+16
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 09d561db: Merge "Fix PTS handling for buffer replacement" into mnc-devDan Stoza2015-05-135-18/+13
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 91e485fa to mnc-dev-plus-aospKenny Root2015-05-1315-278/+1966
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | frameworks/native: document native types and enumsJohan Euphrosine2015-05-1215-278/+1966
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | libgui: Hook up onFrameReplacedDan Stoza2015-05-122-19/+16
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | SurfaceFlinger: Fix PTS on stale buffersDan Stoza2015-04-303-0/+15
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "BufferQueue: Add NATIVE_WINDOW_BUFFER_AGE query"Dan Stoza2015-04-291-0/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | BufferQueue: Add NATIVE_WINDOW_BUFFER_AGE queryDan Stoza2015-04-281-0/+4
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libgui: Change detachNextBuffer to return sp<GB>Dan Stoza2015-04-271-1/+1
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update app opsRoman Birg2015-11-021-1/+13
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | binder: Squashed commit of MemoryHeapBaseIoncodeworkx2015-11-022-1/+74
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | native: dock batteryJorge Ruesga2015-10-172-0/+14
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support WAKE flag in keyboard layoutsnadlabak2015-10-171-0/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add GESTURE_SENSOR input sourceEthan Chen2015-10-171-0/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring back support for glReadPixels screenshot pathPawit Pornkitprasan2015-10-161-1/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | exynos4: getphys implementation on buffermanager for samsung omxRicardo Cerqueira2015-10-151-0/+4