summaryrefslogtreecommitdiffstats
path: root/libs
Commit message (Collapse)AuthorAgeFilesLines
* am efc0b35f: Merge "Fix CAS argument type."Hans Boehm2014-08-191-1/+1
|\ | | | | | | | | * commit 'efc0b35fbd256bb3e225f4a1b953d0895ee3e99a': Fix CAS argument type.
| * Merge "Fix CAS argument type."Hans Boehm2014-08-161-1/+1
| |\
| | * Fix CAS argument type.Hans Boehm2014-08-191-1/+1
| | | | | | | | | | | | | | | | | | | | | Gcc apparently doesn't check; clang does. Bug:17067219 Change-Id: I184084a5063131dbc857c63f97e70e78a05e1a76
* | | am 51d3d176: Merge "Within CpuConsumer, use gralloc lockAsync/unlockAsync" ↵Riley Andrews2014-08-191-31/+60
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit '51d3d176e35abc8b72e55035b0f7b81388ee044d': Within CpuConsumer, use gralloc lockAsync/unlockAsync
| * | | Within CpuConsumer, use gralloc lockAsync/unlockAsyncRiley Andrews2014-08-191-31/+60
| | | | | | | | | | | | | | | | Change-Id: I6b2cd195e111c3c7bf94c8052af4db92e09649a5
* | | | am 62fbb163: Shelve InputFlinger for another release. DO NOT MERGEMichael Wright2014-08-192-60/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '62fbb16383d6d8268821f947e2c6d0828f7e2b41': Shelve InputFlinger for another release. DO NOT MERGE
| * | | Shelve InputFlinger for another release. DO NOT MERGEMichael Wright2014-08-182-60/+0
| | | | | | | | | | | | | | | | Change-Id: I0f034a2b8b1d9192f61f5001799bd3aa4b3964c7
* | | | am 703b60ce: Merge "Use gettid directly in binder."Elliott Hughes2014-08-181-1/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit '703b60ce39e52d319074adf53704d33f9c16dbbd': Use gettid directly in binder.
| * | | Use gettid directly in binder.Elliott Hughes2014-08-181-1/+1
| | |/ | |/| | | | | | | | | | Bug: 17048545 Change-Id: I1df378135961e085a52f6cc5694ad74cd73aac19
* | | am a0187a9c: Merge "Revert "Revert "Revert "Revert "Remove incorrect ↵Hans Boehm2014-08-131-14/+18
|\ \ \ | |/ / | | / | |/ |/| | | | | 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-14/+18
| | | | | | | | | | | | | | | | After fixing b/16874785. This reverts commit f010a05c7e9a23b6083294aff4a8183ab01f686e. Change-Id: I1645ca5d6f60595bf5d388913665ce4b8780b26d
| * Revert "Revert "Revert "Remove incorrect android_atomic_...64 use."""Hans Boehm2014-08-091-18/+14
| | | | | | | | | | | | This reverts commit 66629e0de532376fa3ef43175ad05eccd21114da. Change-Id: Ic298b345d0e500d18e4297b00e755ce3340f13fb
| * Revert "Revert "Remove incorrect android_atomic_...64 use.""Hans Boehm2014-08-081-14/+18
| | | | | | | | | | | | | | 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-18/+14
| | | | | | | | | | | | This reverts commit 88b7541d682a6ad402eff15e58c9c792497096d7. Change-Id: Ie701c308451a3697bb167aff119318b932133f90
| * Remove incorrect android_atomic_...64 use.Hans Boehm2014-07-231-14/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-5/+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-091-0/+10
|\ \
| * | Tunneled Video Playback supportRachad2014-08-041-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | Added native_window_set_sideband_stream() method to Surface.[h|cpp] Added ConfigureVideoTunnelModeParams OMX configuration structure to HardwareAPI.h Bug: 16132368 Change-Id: I28fa1b9dbe858d93e353e0991098cad45c626bd9
* | | Revert "Modify EGL to disconnect the window when the surface gets destroyed."Michael Lentine2014-08-081-2/+2
| | | | | | | | | | | | This reverts commit 843cbb241da60ada234918a30cfe9a01a1e04187.
* | | Sensor related changes for NDK.Aravind Akella2014-08-051-1/+12
|/ / | | | | | | | | | | | | | | | | i) ASensorManager_getDefaultSensor returns a wake-up/non wake-up sensor depending on the type. ii) Add ASensor_isWakeUpSensor and ASensorManager_getDefaultSensorEx methods. Bug : 16399898 Change-Id: I1a86fb8d9de23039fdf41679d1487e1cd761a9d0
* | Sensor.cpp changes.Aravind Akella2014-07-311-9/+48
| | | | | | | | | | | | | | | | 1) Rename TILT_DETECTOR 2) Set mFlags correctly for wake-up sensors. 2) Log errors for incorrect sensor flags. Change-Id: Ia449217d3b8a53353ad6b5c33c544ce37eb1de4f
* | Allow for resizing of Virtual Displays.Michael Lentine2014-07-301-0/+4
| | | | | | | | | | | | | | | | | | | | Modify SurfaceFlinger to use VirtualDisplaySurface in all cases when a virtual display is used. Add functionality in VirtualDisplaySurface to resize the buffers aquired in the QueueBufferOutput. Add transaction support in SurfaceFlinger for resize. Add the modification of the size in DisplayDevice. Change-Id: Iae7e3556dc06fd18d470adbbd76f7255f6e6dd6b Tested: None
* | Have VirtualDisplays send SF resize messages when resizingMichael Wright2014-07-301-0/+14
| | | | | | | | Change-Id: I76d15b22099a659450ec875836c9bf2b6584838f
* | Merge "Modify EGL to disconnect the window when the surface gets destroyed." ↵Michael Lentine2014-07-251-2/+2
|\ \ | | | | | | | | | into lmp-dev
| * | Modify EGL to disconnect the window when the surface gets destroyed.Michael Lentine2014-07-291-2/+2
| | | | | | | | | | | | | | | | | | Bug: 14445579 Change-Id: I1d263ff6cffcb6e448761fca7ca4b06466ad65aa
* | | Remove WAKE_UP_* sensor constants.Aravind Akella2014-07-281-77/+4
| | | | | | | | | | | | Change-Id: I3de9d114ce82de4ed841932747d72e1f6f73c24f
* | | BufferQueueProducer: fix which slot gets pre-allocatedAntoine Labour2014-07-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 78014f32da6d0ebf52fb34ebb7663863000520a0 introduced a bug that made us pre-allocate buffers into the last available free slots instead of the first available ones. This in turn caused more re-allocations, and possibly triggered driver bugs. Change-Id: Ic4a70e676b4f2bbb054bc873be62ced26e3099a0
* | | Merge "SensorService performance improvements." into lmp-devAravind Akella2014-07-243-15/+15
|\ \ \
| * | | SensorService performance improvements.Aravind Akella2014-07-243-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i) Send ack for wake_up sensors on the socket connection instead of using Binder RPC. ii) Cache events per connection in case there are write failures. Compute cache size from FIFO counts of sensors. iii) Send FlushCompleteEvent only for apps that explicitly called flush(). Change-Id: I018969736b7794b1b930529586f2294a03ee8667
* | | | Merge "GLProducer: Reference count images rather than buffers." into lmp-devEric Penner2014-07-241-169/+155
|\ \ \ \ | |/ / / |/| | |
| * | | GLProducer: Reference count images rather than buffers.Eric Penner2014-07-211-169/+155
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In most cases, EGLImages can be created one-to-one with graphic buffers in slots, but that was difficult due to some special cases: - ReleaseTexImage binds a custom 'unslotted' debug image. - When all slots are freed, we still need to hang on to one. These cases were handled by keeping an additional reference to the 'current' buffer (mCurrentTextureBuf), but we would create new images since we can't reference count them in the same way. This patch uses the same semantics, except that it reference counts the image (an EglImage wrapper class) rather than just buffer. The wrapper class also detects the cases when we need a new EGLImage, and only creates them in those rare cases. Change-Id: I2915761dbe49d2a9bda1f59e60f857543634636b
* | | | add noteResetVideo/Audio to IBatteryStatsChong Zhang2014-07-231-0/+24
| | | | | | | | | | | | | | | | | | | | Bug: 12979595 Change-Id: Ida474e539a3af0a85ec157a66bbf986430c8020e
* | | | Merge "crash if getNativeBuffer() called on NULL GraphicBuffer" into lmp-devColin Cross2014-07-231-0/+1
|\ \ \ \
| * | | | crash if getNativeBuffer() called on NULL GraphicBufferColin Cross2014-07-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If getNativeBuffer() is called on a NULL GraphicBuffer the static_cast of this from GraphicBuffer* to ANativeWindowBuffer* will return a small pointer like (ANativeWindowBuffer*)0x10. This value can propagate past NULL checks until it causes a crash far away from the original NULL pointer. Crash immediately instead. Change-Id: Id614b9eb1484108b3c3c733545309844c4b87532
* | | | | Merge "update battery status for audio/video" into lmp-devChong Zhang2014-07-221-0/+56
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | update battery status for audio/videoChong Zhang2014-07-221-0/+56
| | |/ / | |/| | | | | | | | | | | | | | | | | | Bug: 12979595 Change-Id: Ic8e8d625becc6d1050f840ad63b7423f388eeba3
* | | | BufferQueue: release mutex while allocating. DO NOT MERGEAntoine Labour2014-07-222-41/+101
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BufferQueueProducer::allocateBuffers used to keep the BufferQueueCore mutex while doing the buffer allocation, which would cause the consumer (which also needs the mutex) to block if the allocation takes a long time. Instead, release the mutex while doing the allocation, and grab it again before filling the slots. Keep a bool state and a condvar to prevent other producers from trying to allocate the slots while the mutex is released. Bug: 11792166 Change-Id: I4ab1319995ef892be2beba892f1fdbf50ce0416d (cherry picked from commit ea96044470a29133321c681080870b9d31f81a19)
* | | Add glance gesture for doze mode.Jeff Brown2014-07-171-0/+4
|/ / | | | | | | Change-Id: I038a706c3999200313ff5360c5ff1150ec081f08
* | Add sticky transform to surfaceflinger.Ruben Brunk2014-07-143-5/+50
| | | | | | | | | | | | | | | | | | | | Bug: 15116722 - Adds a sticky transform field that can be set from a SurfaceFlinger client Surface. This transform is added to any transform applied to the Surface. Change-Id: Idaa4311dfd027b2d2b8ea5e2c6cba2da5779d753
* | Merge "BufferQueue: Add allocateBuffers method"Dan Stoza2014-06-273-0/+87
|\ \
| * | BufferQueue: Add allocateBuffers methodDan Stoza2014-06-203-0/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds an allocateBuffers method to BufferQueue, which instructs it to allocate up to the maximum number of buffers allowed by the current configuration. The goal is that this method can be called ahead of render time, which will prevent dequeueBuffers from blocking in allocation and inducing jank. This interface is also plumbed up to the native Surface (and, in another change, up to the Java Surface and ThreadedRenderer). Bug: 11792166 Change-Id: I4aa96b4351ea1c95ed5db228ca3ef98303229c74
* | | GLConsumer: Allow creation in detached modeDan Stoza2014-06-251-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | Adds a constructor that doesn't require a GLES texture name and sets up the GLConsumer in detached mode. Bug: 15616428 Change-Id: Idc9ea2e59baa24bbd959da9fffe0fb71c0aa9818
* | | GLConsumer: Stop using default constructor paramsDan Stoza2014-06-243-4/+8
|/ / | | | | | | | | | | | | | | Removes the dependency on default constructor parameters for GLConsumer so that a different constructor prototype can safely be added. Change-Id: I0da924bbd4c141edbf305598c1be8bc575654680
* | Merge "Remove Parcel::writeIntPtr."Narayan Kamath2014-06-101-5/+0
|\ \
| * | Remove Parcel::writeIntPtr.Narayan Kamath2014-06-121-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | All uses of this API have been removed. It should never have been made public in the first place. bug: 15424960 Change-Id: Id07d24ec95b2b393e6da138a7e8a9a4ecebeca94
* | | Merge "Surface reportingMode for Sensors."Aravind Akella2014-06-121-33/+73
|\ \ \
| * | | Surface reportingMode for Sensors.Aravind Akella2014-06-121-33/+73
| | | | | | | | | | | | | | | | Change-Id: Iac8dd3408c90eb7d285a2e8043131fab3a7e58fa
* | | | Merge "surfaceflinger: Replace blank/unblank with setPowerMode"Prashant Malani2014-06-122-28/+13
|\ \ \ \ | |_|/ / |/| | |
| * | | surfaceflinger: Replace blank/unblank with setPowerModePrashant Malani2014-06-052-28/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We replace the blank/unblank calls in surfaceFlinger with a more generic setPowerMode() routine. Some displays support different power modes (for example, with reduced color palettes). Depending on the use case we should be able to toggle these modes, so as to achieve incremental power savings. Initially, three power modes will be supported: - HWC_POWER_MODE_OFF - HWC_POWER_MODE_DOZE - HWC_POWER_MODE_NORMAL HWC_POWER_MODE_OFF will correspond to blanking the display, while HWC_POWER_MODE_NORMAL will correspond to unblanking. HWC_POWER_MODE_DOZE will put the display into a low power setting, if it is supported in hardware. If such a low power mode is not supported, it should be treated as a call to set the mode to HWC_POWER_MODE_NORMAL. As a consequence of adding the mPowerMode field, the mScreenAcquired is no longer required, and thus references to it are removed and replaced equivalent references to mPowerMode. We also add the glue code to connect the services invocation of setting a power mode and the HAL implementation in HWComposer. Bug: 13472578 Change-Id: I431595ecf16d2f2c94259272db3dd42f29636204 Signed-off-by: Prashant Malani <pmalani@google.com>
* | | | am 72676e7d: am 0e1313cd: Merge "libgui: 64-bit compile issues"Mark Salyzyn2014-06-112-4/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * commit '72676e7d0db89d477495245aa15f1a128b5c35bc': libgui: 64-bit compile issues