summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Merge "surfaceflinger: fix -Wmismatched-tags warnings" into lmp-mr1-devJesse Hall2014-10-311-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | surfaceflinger: fix -Wmismatched-tags warningsJesse Hall2014-10-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | warning: struct 'HWComposer' was previously declared as a class [-Wmismatched-tags] warning: class 'DisplayInfo' was previously declared as a struct [-Wmismatched-tags] Change-Id: I13db9f8aab3a957ce8ff8d64598dae1807d6fe7e (cherry picked from commit 646f54105018e99ef4a30ee41f01f7d1ab66c38e)
| * | | Initialize ARect fields in default ctorDmitriy Ivanov2014-10-281-0/+1
| |/ / | | | | | | | | | | | | | | | | | | So that we can use Rect() for update and such. Bug: 18095940 Change-Id: I03ed87121d2d279f22013b75e95dd7254551ca1f
* | | am f3929d66: am e42cba8f: Merge "Initialize ARect fields in default ctor"Dan Stoza2014-10-291-0/+1
|\ \ \ | | |/ | |/| | | | | | | * commit 'f3929d6611bb8278e561fdd4b05a21915ac9de76': Initialize ARect fields in default ctor
| * | am e42cba8f: Merge "Initialize ARect fields in default ctor"Dan Stoza2014-10-291-0/+1
| |\ \ | | | | | | | | | | | | | | | | * commit 'e42cba8feb2bbfe385f162a06e41e2c2c0f40c99': Initialize ARect fields in default ctor
| | * | Initialize ARect fields in default ctorDmitriy Ivanov2014-10-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | So that we can use Rect() for update and such. Bug: 18095940 Change-Id: I03ed87121d2d279f22013b75e95dd7254551ca1f
| * | | am 3454f123: media: add kMetadataBufferTypeGraphicBufferLajos Molnar2014-10-141-0/+18
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '3454f123d0a10bd0ce0760828996aa26c80a8fd4': media: add kMetadataBufferTypeGraphicBuffer
| * \ \ \ am a7eb4b74: Merge "Fix sockfd leakage in SensorService." into lmp-devAravind Akella2014-10-031-0/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a7eb4b74f74423dafd88adf94a7984ae927c3a23': Fix sockfd leakage in SensorService.
| * \ \ \ \ am 0ba908e7: Merge "add OMX_VIDEO_AVCLevel52 constant" into lmp-devLajos Molnar2014-10-021-0/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0ba908e7a55ce2641f8886db2a059ccaa3f7a22a': add OMX_VIDEO_AVCLevel52 constant
| * \ \ \ \ \ am dd230cb8: Merge "add a parameter for PCM limiter enable" into lmp-devChong Zhang2014-10-011-0/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dd230cb8d2a43ea453a507b12c612a221a3780e7': add a parameter for PCM limiter enable Use set_sched_policy to put dexopt operations in SP_BACKGROUND cgroup Revert "Modify EGL to disconnect the window when the surface gets destroyed." crash if getNativeBuffer() called on NULL GraphicBuffer
| * \ \ \ \ \ \ resolved conflicts for merge of 67d8bd66 to lmp-dev-plus-aospLajos Molnar2014-09-182-0/+39
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2e9aab90ac53bb32630598f50cc26f6e46acf6d6
* | \ \ \ \ \ \ \ am 53aad5e7: am 3454f123: media: add kMetadataBufferTypeGraphicBufferLajos Molnar2014-10-141-0/+18
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | * commit '53aad5e7de7619cbc9b0d9a0a0830fc29c331f8d': media: add kMetadataBufferTypeGraphicBuffer
| * | | | | | | | am 3454f123: media: add kMetadataBufferTypeGraphicBufferLajos Molnar2014-10-141-0/+18
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | * commit '3454f123d0a10bd0ce0760828996aa26c80a8fd4': media: add kMetadataBufferTypeGraphicBuffer
| | * | | | | | | media: add kMetadataBufferTypeGraphicBufferLajos Molnar2014-10-131-0/+18
| | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17935149 Change-Id: I1c26d1e83d8fa0a9ccdb25f6f3b19a86b1dc6f37
* | | | | | | | am b7702c5c: Merge "BufferQueueProducer: Throttle EGL frame production." ↵Jesse Hall2014-10-081-0/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit 'b7702c5ce7f010fa5f19646fd79f28ff04e7014b': BufferQueueProducer: Throttle EGL frame production.
| * | | | | | | Merge "BufferQueueProducer: Throttle EGL frame production." into lmp-mr1-devJesse Hall2014-10-081-0/+6
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | BufferQueueProducer: Throttle EGL frame production.Eric Penner2014-10-031-0/+6
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Throttling was previously controlled by a combination of the driver and the number of buffers in the queue. This patch makes a more consistent trade-off, which allows two GPU frames pending but not three. More buffering could improve throughput in the case of varying frame times, but this also increases latency. Bug: 17502897 Change-Id: I4ee68019ca94c635294c5959931a555a6c4ef2df
* | | | | | | am 93176114: am a7eb4b74: Merge "Fix sockfd leakage in SensorService." into ↵Aravind Akella2014-10-031-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit '93176114cf34c9874c2db70fd7665e9f95dda9d0': Fix sockfd leakage in SensorService.
| * | | | | | Merge "Fix sockfd leakage in SensorService." into lmp-devAravind Akella2014-10-031-0/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Fix sockfd leakage in SensorService.Aravind Akella2014-10-021-0/+1
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i) Call removeFd() only if the fd in the BitTube has been previously added to the Looper. Use a flag to determine whether the fd has been previously added or not. ii) Increment mPendingFlushEventsToSend after holding a connectionLock. iii) Store the number of acks that are pending in SensorEventQueue and send them all at once. Bug: 17472228 Change-Id: I1ec834fea1112a9cfbd9cddd2198438793698502
* | | | | | am 167013b2: am 0ba908e7: Merge "add OMX_VIDEO_AVCLevel52 constant" into lmp-devLajos Molnar2014-10-021-0/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '167013b2bea340ccf14bf751ef39cc5abef4533a': add OMX_VIDEO_AVCLevel52 constant
| * | | | | add OMX_VIDEO_AVCLevel52 constantLajos Molnar2014-10-011-0/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | Bug: 17676461 Change-Id: I120041e9b2ffe2a232a2419bcb5fe88cb49961cb
* | | | | am dd230cb8: Merge "add a parameter for PCM limiter enable" into lmp-devChong Zhang2014-10-021-0/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dd230cb8d2a43ea453a507b12c612a221a3780e7': add a parameter for PCM limiter enable Use set_sched_policy to put dexopt operations in SP_BACKGROUND cgroup Revert "Modify EGL to disconnect the window when the surface gets destroyed." crash if getNativeBuffer() called on NULL GraphicBuffer
| * | | | add a parameter for PCM limiter enableChong Zhang2014-10-011-0/+1
| | |/ / | |/| | | | | | | | | | | | | | Bug: 17470065 Change-Id: I327115fc16e7afe2bf5870e123d63f9887161206
* | | | resolved conflicts for merge of 67d8bd66 to lmp-mr1-dev-plus-aospLajos Molnar2014-09-192-0/+39
|\ \ \ \ | |/ / / | | / / | |/ / |/| | Change-Id: I5e7e6fdf0d2afe6c3e4a0ed6ef96afb4713a72bc
| * | surfaceflinger: add getDisplayStats() methodLajos Molnar2014-09-182-0/+39
| | | | | | | | | | | | | | | | | | | | | | | | This is used by media service to schedule video frames at the proper time, based on precise vsync timings. Bug: 14659809 Change-Id: I1a90603f3dc09dca9aa4f90a3aa845fab56e0a5e
* | | am 8493b79e: SensorService fixesAravind Akella2014-09-121-1/+1
|\ \ \ | |/ / | | | | | | | | | * commit '8493b79e1cff92450076ca7450c4bf4e434a6816': SensorService fixes
| * | SensorService fixesAravind Akella2014-09-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i) Significant Motion multiple clients fix. Make a copy of mActiveConnections vector before cleaning up SensorEventConnections when one-shot sensors trigger. ii) Maintain a mapping between flush_complete_events and SensorEventConnections to accurately map flush() API calls and corresponding flush_complete_events iii) Remove all references to 1_1 and 1_2 HALs. iv) Dynamically allocate sensor_event buffers in SensorService main threadLoop. Bug: 17412359 Change-Id: If3c3986197660cafef2d2e0b4dc7582e229cf1c4
* | | am fb017a4c: Merge "Fix clang warnings about struct vs. class."Dan Albert2014-09-101-1/+1
|\ \ \ | | |/ | |/| | | | | | | * commit 'fb017a4c3b23741f737093c3fcb78087bbe5e73c': Fix clang warnings about struct vs. class.
| * | Fix clang warnings about struct vs. class.Dan Albert2014-09-091-1/+1
| | | | | | | | | | | | Change-Id: I9f26cd01ac3153efa6d77a4133686842e2d63203
| * | Revert "Revert "Revert "Revert "Remove incorrect android_atomic_...64 use.""""Hans Boehm2014-08-121-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | After fixing b/16874785. This reverts commit f010a05c7e9a23b6083294aff4a8183ab01f686e. Change-Id: I1645ca5d6f60595bf5d388913665ce4b8780b26d
| * | Revert "Revert "Revert "Remove incorrect android_atomic_...64 use."""Hans Boehm2014-08-091-3/+1
| | | | | | | | | | | | | | | | | | This reverts commit 66629e0de532376fa3ef43175ad05eccd21114da. Change-Id: Ic298b345d0e500d18e4297b00e755ce3340f13fb
| * | Revert "Revert "Remove incorrect android_atomic_...64 use.""Hans Boehm2014-08-081-1/+3
| | | | | | | | | | | | | | | | | | | | | This reverts commit 9dc5c269f74ac76f62515e3d9558e67c6e63067d. Adds a stdint.h include in case stdatomic.h stops including that. Change-Id: If3dd1db1f1132c0f2dc1efb0a44617d3f36d7cfb
| * | Revert "Remove incorrect android_atomic_...64 use."Hans Boehm2014-08-061-2/+1
| | | | | | | | | | | | | | | | | | This reverts commit 88b7541d682a6ad402eff15e58c9c792497096d7. Change-Id: Ie701c308451a3697bb167aff119318b932133f90
| * | Remove incorrect android_atomic_...64 use.Hans Boehm2014-07-231-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the mExtras field in Binder.h to be a stdatomic.h atomic value, and replace references to it with proper stdatomic.h calls. This removes one of a small number of remaining 64 bit android_atomic references. It also replaces the erroneously non-atomic read accesses to mExtras. It would be better if this used the C++11 <atomic> facility, but we don't quite have that yet. Bug: 16513433 Change-Id: Ibabb88d05025187ee1ce6c7f1aa670b133a547f8
| * | Remove Parcel::writeIntPtr.Narayan Kamath2014-06-131-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All uses of this API have been removed. It should never have been made public in the first place. bug: 15424960 (cherry picked from commit 7da40c0a84dd89e92201448dd5ed3387dc94df2b) Change-Id: I8d89f62dbdaee7149ef908e0c97417b85e0c48a2
* | | am 1173137a: Merge "Add support for max res decode" into lmp-devJeff Tinker2014-09-101-0/+6
|\ \ \ | | |/ | |/| | | | | | | * commit '1173137af3fb93c7708fb7b1109c5b37db72d783': Add support for max res decode
| * | Merge "Add support for max res decode" into lmp-devJeff Tinker2014-09-091-0/+6
| |\ \
| | * | Add support for max res decodeJeff Tinker2014-08-281-0/+6
| | | | | | | | | | | | | | | | | | | | bug: 16034599 Change-Id: Ia1de1457ca29fe1dd7e55f4bb45da45ea3f6e5b1
* | | | am d15ef27f: Update ScreenshotClient to take advantage of rotation in ↵Riley Andrews2014-09-091-0/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | surfaceflinger\'s screencap api * commit 'd15ef27f9b13727fa7358e3c09572f66bb1e0668': Update ScreenshotClient to take advantage of rotation in surfaceflinger's screencap api
| * | | Update ScreenshotClient to take advantage of rotation in surfaceflinger's ↵Riley Andrews2014-09-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | screencap api Change-Id: I836649d9d5cd5958ce34e47f26f4a36d2d05d24c
* | | | am edb86f9f: Merge "Add rotation to surfaceflingers screen cap." into lmp-devRiley Andrews2014-09-091-1/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'edb86f9f681e082a64a670814ee4d73ccf39942a': Add rotation to surfaceflingers screen cap.
| * | | Add rotation to surfaceflingers screen cap.Riley Andrews2014-09-091-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + This is needed so that activity manager does not have to do cpu side rotations when capturing recents thumbnails. Change-Id: If998008e675ad01305db8399fd643cf4608b7025
* | | | Make string literal concatenation play nice with C++11.Dan Albert2014-09-091-5/+5
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | In C++11 mode, "foo"MACRO_THAT_EXPANDS_TO_STRING gets lexed as a user defined literal. Add space around the macro. Had missed these when resolving merge conflicts last night. Change-Id: I1a381a06c3909b76a3b44ce79c37aa6f244d3736
* | | Make IPowerManager native conform to .aidl for onewayGlenn Kasten2014-09-051-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | But provide a temporary escape hatch for AudioFlinger. This oneway option will be removed as soon as possible. Bug: 16408906 Change-Id: I20d6da1969ae05b96e72795463470eb4c1f8fbdc
* | | Merge "SensorService flush fixes." into lmp-devAravind Akella2014-09-051-1/+1
|\ \ \
| * | | SensorService flush fixes.Aravind Akella2014-09-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i) Fix a possible race condition when adding a pending flush connection to mActiveSensors data structure. ii) Invalidate flush_complete_events as soon as they are consumed by a connection so that they are not used by other connections which are registered for the same sensor. Change-Id: I1491bea8c2081c4aab1feacc60add13b7aa26bb7
* | | | Fix undefined behavior (not returning a value from a function with return).Stephen Hines2014-09-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17379740 This function was missing a return statement, even though it declares a return type. This is undefined behavior, which clang miscompiled into just falling through to a later function in some cases. Adding the return statement fixes the undefined behavior (and probably fixes a bug too). Change-Id: I05c03b6473b831769dc4fa8b5ba43fb4249f7626
* | | | Merge "New keycode definitions for TV remotes." into lmp-devWally Yau2014-09-032-1/+57
|\ \ \ \
| * | | | New keycode definitions for TV remotes.ASAZU, Hideki2014-09-022-1/+57
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Keys which are necessary for supporting world-wide broadcast standard or used commonly for TV/STB remotes. Change-Id: I2721ceb7d956c87f1d4106b99f9d21947ae13d47