summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | 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 75ec33e0: am d15ef27f: Update ScreenshotClient to take advantage of ↵Riley Andrews2014-09-091-0/+4
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rotation in surfaceflinger\'s screencap api * commit '75ec33e0e609e3ef074f4230c2227e52bf82ad06': Update ScreenshotClient to take advantage of rotation in surfaceflinger's screencap api
| * | | | | | 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 129dc842: am edb86f9f: Merge "Add rotation to surfaceflingers screen ↵Riley Andrews2014-09-091-1/+9
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cap." into lmp-dev * commit '129dc8423da319d42af6ef71046c39ba59c0d878': Add rotation to surfaceflingers screen cap.
| * | | | | | 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
* | | | | | | am 7d831871: Make string literal concatenation play nice with C++11.Dan Albert2014-09-091-5/+5
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '7d831871032675e252490b52ddbb29a63e5497bf': Make string literal concatenation play nice with C++11.
| * | | | | | 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
* | | | | | am 91b6028e: am d44fea68: Merge "Make IPowerManager native conform to .aidl ↵Glenn Kasten2014-09-081-4/+7
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for oneway" into lmp-dev * commit '91b6028e07bc9494afc69ae4f83c3ee49de7d209': Make IPowerManager native conform to .aidl for oneway
| * | | | | 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 "surfaceflinger: fix -Wmismatched-tags warnings"Jesse Hall2014-09-061-1/+1
|\ \ \ \ \ \
| * | | | | | surfaceflinger: fix -Wmismatched-tags warningsJesse Hall2014-09-041-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
* | | | | | | am 71ec4a81: am 253c4720: Merge "SensorService flush fixes." into lmp-devAravind Akella2014-09-051-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | * commit '71ec4a8179a3f24de04e9a6ac824d896f1835170': SensorService flush fixes.
| * | | | | | 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
* | | | | | | | am c1ad526c: am 9c0a80b8: Merge "Fix undefined behavior (not returning a ↵Stephen Hines2014-09-041-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | / / / / / | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | value from a function with return)." into lmp-dev * commit 'c1ad526c9cc5c79c8596ce23049f56b070917895': Fix undefined behavior (not returning a value from a function with return).
| * | | | | | 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 "Add RGBA8888 to OMX_COLOR_FORMATTYPE"David Smith2014-09-031-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Add RGBA8888 to OMX_COLOR_FORMATTYPEDavid Smith2014-09-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie3d2c7012e48b694f438c90e6a06949076c4b559
* | | | | | | | am 3aa066e9: am 19f8b79f: Merge "New keycode definitions for TV remotes." ↵Wally Yau2014-09-032-1/+57
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit '3aa066e9d7480f0be806ac2d9f92bbb22771477b': New keycode definitions for TV remotes.
| * | | | | | | 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
| * | | | | | | Revert "Revert "Revert "Revert "Remove incorrect android_atomic_...64 use.""""Hans Boehm2014-09-021-1/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After fixing b/16874785. This reverts commit f010a05c7e9a23b6083294aff4a8183ab01f686e. Original comment, which actually describes the effect of this: 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. Fixes Bug:16513433 Change-Id: I1645ca5d6f60595bf5d388913665ce4b8780b26d (cherry picked from commit 3effababf2980d029339522fdc914bdeb913d99b)
* | | | | | | am 57782cd2: am 5c4a1566: Merge "GLConsumer: Fix eglTerminate/eglInit edge ↵Eric Penner2014-08-271-1/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | case." into lmp-dev * commit '57782cd25539aa163b885cd336144d4c8bc9f665': GLConsumer: Fix eglTerminate/eglInit edge case.
| * \ \ \ \ \ \ am 5c4a1566: Merge "GLConsumer: Fix eglTerminate/eglInit edge case." into ↵Eric Penner2014-08-271-1/+3
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit '5c4a15665968471ddbac0b476514d00503e997c7': GLConsumer: Fix eglTerminate/eglInit edge case.
| | * | | | | | GLConsumer: Fix eglTerminate/eglInit edge case.Eric Penner2014-08-271-1/+3
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a display is terminated and then initialized, we can't detect this using the display itself (it has the same value), but all EglImages still become invalid for the display. This patch detects this during image binding and forces creation of a new EglImage. Bug: 10430249 Change-Id: I75101c50962f21263dca3ec6e241a2e5a3c23dad
* | | | | | | am 8a79617f: am f00945cf: Merge "Add native flag to reflect new density ↵Adam Lesinski2014-08-261-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | | | | | | | | | | | | | | type" into lmp-dev * commit '8a79617f34020a71d345301c47b217d07597b469': Add native flag to reflect new density type
| * | | | | am f00945cf: Merge "Add native flag to reflect new density type" into lmp-devAdam Lesinski2014-08-261-0/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'f00945cfd7b105ad83aa0e26478681ee2ebf9bb7': Add native flag to reflect new density type
| | * | | | Add native flag to reflect new density typeAdam Lesinski2014-08-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug:17007265 Change-Id: If0129c4ad222fe28628d6f7cd8ee78fc6424e177
* | | | | | am dea63477: am b1bbfc2d: Merge "Add Voice Assist key." into lmp-devMichael Wright2014-08-222-1/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'dea63477e470f3bbcdbe16fcaa20343a4cf4d186': Add Voice Assist key.
| * | | | | am b1bbfc2d: Merge "Add Voice Assist key." into lmp-devMichael Wright2014-08-222-1/+3
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'b1bbfc2d029b709f6b4bb26f4d840e4002eb3781': Add Voice Assist key.
| | * | | | Add Voice Assist key.Michael Wright2014-08-212-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16292420 Change-Id: I607fadc2edf673079bfd9f7406e6e45603474957
* | | | | | am d553ce40: am a54f3b2f: Merge "SensorService fixes." into lmp-devAravind Akella2014-08-191-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'd553ce4092feefd625e4a4cd073a3d18d4b983c9': SensorService fixes.
| * | | | | am a54f3b2f: Merge "SensorService fixes." into lmp-devAravind Akella2014-08-191-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'a54f3b2f4a1d531bca952b5a10fa8181502ce820': SensorService fixes.
| | * | | | SensorService fixes.Aravind Akella2014-08-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) Flush should only be received by the app calling flush(). Maintain a queue of all flush() calls and send flush_complete events in that order. 2) Log warnings for older HALs. Remove batch() calls with DRY_RUN flag. 3) Reallocate event cache when more sensors register and the desired maxCacheSize increases. Clear NEEDS_ACK flag in the buffer whenever there is a write() failure. 4) More dump information. Add wake-up flag, maxDelay and timestamps for sensor events. Bug: 16874778 Change-Id: I195646191059fd31f75f2f07886c0f98bf9b509a
| * | | | | am 62fbb163: Shelve InputFlinger for another release. DO NOT MERGEMichael Wright2014-08-191-54/+0
| |\ \ \ \ \ |/ / / / / / | | _ / / / | | / / / | | | | | * commit '62fbb16383d6d8268821f947e2c6d0828f7e2b41': Shelve InputFlinger for another release. DO NOT MERGE
| * | | | Shelve InputFlinger for another release. DO NOT MERGEMichael Wright2014-08-181-54/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I0f034a2b8b1d9192f61f5001799bd3aa4b3964c7
* | | | | am a0187a9c: Merge "Revert "Revert "Revert "Revert "Remove incorrect ↵Hans Boehm2014-08-131-1/+3
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | | | | | android_atomic_...64 use.""""" * commit 'a0187a9c83cb042b4cb92dac59214247bb7affcf': Revert "Revert "Revert "Revert "Remove incorrect android_atomic_...64 use.""""
| * | | 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
* | | | Merge "Tunneled Video Playback support" into lmp-devRachad2014-08-092-0/+22
|\ \ \ \
| * | | | Tunneled Video Playback supportRachad2014-08-042-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added native_window_set_sideband_stream() method to Surface.[h|cpp] Added ConfigureVideoTunnelModeParams OMX configuration structure to HardwareAPI.h Bug: 16132368 Change-Id: I28fa1b9dbe858d93e353e0991098cad45c626bd9
* | | | | Merge "Sensor related changes for NDK." into lmp-devAravind Akella2014-08-051-1/+13
|\ \ \ \ \