summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | 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
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable sensor data injection mode through adb.Aravind Akella2015-06-302-2/+2
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | omx: add OMX_IndexParamConsumerUsageBitsLajos Molnar2015-06-252-0/+2
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "libgui/SF: Propagate SECURE Layer flag changes" into mnc-devDan Stoza2015-06-231-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libgui/SF: Propagate SECURE Layer flag changesDan Stoza2015-06-181-2/+2
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add new AINPUT_SOURCE_BLUETOOTH_STYLUS" into mnc-devMichael Wright2015-06-231-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new AINPUT_SOURCE_BLUETOOTH_STYLUSMichael Wright2015-06-121-0/+1
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add method to set action button on MotionEventMichael Wright2015-06-171-0/+2
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Add tracing headerChris Craik2015-06-101-0/+55
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "media: change parameters for OMX_EventOutputRendered" into mnc-devLajos Molnar2015-06-092-2/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | media: change parameters for OMX_EventOutputRenderedLajos Molnar2015-06-052-2/+14
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | libgui/SurfaceFlinger: Add getConsumerNameDan Stoza2015-06-083-0/+9
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "Revert "libgui: Add getConsumerName"" into mnc-devDan Stoza2015-06-083-9/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Revert "libgui: Add getConsumerName"Dan Stoza2015-06-083-9/+0
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "libgui: Add getConsumerName" into mnc-devDan Stoza2015-06-083-0/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | / / / / / / / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | libgui: Add getConsumerNameDan Stoza2015-06-053-0/+9
| |/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | Enable more flexible usage of blobs in parcels.Jeff Brown2015-06-051-5/+17
|/ / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge "libgui: Add generation numbers to BufferQueue" into mnc-devDan Stoza2015-06-056-3/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | libgui: Add generation numbers to BufferQueueDan Stoza2015-06-036-3/+41
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | DO NOT MERGE Remove unused ParcelFileDescriptor methods in parcel.Tim Kilbourn2015-06-041-10/+0
| |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | media: rename VideoGrallocMetadata.hHandle to pHandleLajos Molnar2015-06-021-5/+2
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | fix build: media: add back legacy name for VideoGrallocMetadataLajos Molnar2015-06-011-0/+6
| |_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge "media: refine kMetadataBufferTypes" into mnc-devLajos Molnar2015-06-022-29/+64
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | media: refine kMetadataBufferTypesLajos Molnar2015-05-292-29/+64
| | |_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge "Track camera and flashlight usage in battery stats." into mnc-devRuben Brunk2015-06-021-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Track camera and flashlight usage in battery stats.Ruben Brunk2015-06-011-0/+12
| | |_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge "fix BufferItem flatten/unflatten alignment" into mnc-devChong Zhang2015-05-221-2/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | fix BufferItem flatten/unflatten alignmentChong Zhang2015-05-221-2/+14
| |/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge "Adding round qualifier constant to native API." into mnc-devAdam Powell2015-05-181-0/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | |