Ben Clayton
4c5b9acf65
Merge "Don't try to capture the pointer when using PBOs for texture APIs" into lmp-dev
2014-08-16 04:36:37 +00:00
Ben Clayton
16d7b6a8bb
Don't try to capture the pointer when using PBOs for texture APIs
...
If a PBO is bound, then the pointer argument is a relative offset from
the start of the PBO, not an absolute address.
Fixes b/17063439
Change-Id: I39629ce6c9bb3cb6bac5c9b0311287628306ddd4
(cherry picked from commit 0ad707f2f3
)
2014-08-20 15:21:44 +00:00
Michael Lentine
2cfbef255b
Merge "Fix inverse orientation when original is not applied first." into lmp-dev
2014-08-19 22:53:25 +00:00
Michael Lentine
7b90258c7b
Fix inverse orientation when original is not applied first.
...
Change-Id: I6f1a11950c77c99800acbf08a672bc1b2310b0b5
2014-08-19 18:16:01 -07:00
Michael Lentine
1440963470
Fix camera orientation by swapping horizontal and vertical flips when needed.
...
Bug: 16637957
Change-Id: I66de597546fdc19e0af9e6150ca20460ab36bf8b
2014-08-19 16:16:35 -07:00
Michael Lentine
62205596b9
Merge "Fix camera orientation by swapping horizontal and vertical flips when needed." into lmp-dev
2014-08-19 02:43:23 +00:00
Michael Lentine
b3abe7c06a
Merge "Incorporate TransformToDisplayInverse into the crop calculation." into lmp-dev
2014-08-19 15:47:37 +00:00
Michael Lentine
f755140794
Incorporate TransformToDisplayInverse into the crop calculation.
...
Change-Id: Ia9757b3a43d3b8f99df9fef2ed4d11c43b5abdd2
2014-08-18 16:35:43 -07:00
Riley Andrews
51d3d176e3
Merge "Within CpuConsumer, use gralloc lockAsync/unlockAsync" into lmp-dev
2014-08-18 21:31:41 +00:00
Riley Andrews
d53e052322
Within CpuConsumer, use gralloc lockAsync/unlockAsync
...
Change-Id: I6b2cd195e111c3c7bf94c8052af4db92e09649a5
2014-08-19 19:46:10 +00:00
Riley Andrews
866399093f
Take advantage of sync points during screen cap.
...
Do not wait for the screen capture to complete within surface flinger,
instead pass a sync point back with the captured gralloc buffer.
Change-Id: I7137c0e0fc710688d1d61f189159418fb27ea263
2014-08-19 19:27:14 +00:00
Aravind Akella
a54f3b2f4a
Merge "SensorService fixes." into lmp-dev
2014-08-18 21:31:41 +00:00
Aravind Akella
6c2664ae34
SensorService fixes.
...
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
2014-08-19 11:18:25 -07:00
Colin Cross
b1f0f288e3
Merge changes I4cfb3138,I45356c29 into lmp-dev
...
* changes:
atrace: add memory reclaim tracing
atrace: Add IRQ events
2014-08-16 04:32:18 +00:00
Colin Cross
580407f107
atrace: add memory reclaim tracing
...
Add "memreclaim" to trace direct reclaim, shrink slab cycles, and
kswapd waking up and sleeping.
Change-Id: I4cfb313820a3a9aa5a9d07a39c42db41c24304a6
2014-08-18 17:48:16 -07:00
Dan Willemsen
f440d398fa
atrace: Add IRQ events
...
Add "irq" to trace irq and softirq events.
Change-Id: I45356c2912a1fa130667ada7b21e9fb54ddcfba5
2014-08-18 17:47:56 -07:00
Michael Wright
62fbb16383
Shelve InputFlinger for another release. DO NOT MERGE
...
Change-Id: I0f034a2b8b1d9192f61f5001799bd3aa4b3964c7
2014-08-18 10:17:18 -07:00
Jeff Brown
c8c5e4c66b
Merge "Add trace tag for power management." into lmp-dev
2014-08-15 21:23:40 +00:00
Brian Carlstrom
e18987efb5
Disable verification based on vold.decrypt. [frameworks/native]
...
Bug: 15165413
Change-Id: Ie70bf4e1348b7b8b2454cf9b498b272416d61c34
2014-08-15 09:57:55 -07:00
Jeff Brown
3200b0bf50
Add trace tag for power management.
...
Also added a couple of other existing missing tags in atrace.
Bug: 17004602
Change-Id: I6f697a2a15922bd4695acfa203d45eaae40cd00e
2014-08-14 19:24:47 -07:00
Brian Carlstrom
3b14e5b1f3
Use set_sched_policy to put dexopt operations in SP_BACKGROUND cgroup
...
Bug: 15927194
(cherry picked from commit 0378aaf257
)
Change-Id: I462b5ac256c4d091ed4023cf4b97dd6a4abcaa5f
2014-08-11 18:31:03 +01:00
Rachad
7d1cd4aae2
Merge "Tunneled Video Playback support" into lmp-dev
2014-08-09 00:45:27 +00:00
Michael Lentine
45e2fc2226
Revert "Modify EGL to disconnect the window when the surface gets destroyed."
...
This reverts commit 843cbb241d
.
2014-08-08 10:30:44 -07:00
Michael Lentine
25db8dc7c6
Merge "Change output format to not throw warning on volantis." into lmp-dev
2014-08-06 23:49:20 +00:00
Michael Lentine
b54ee7704e
Change output format to not throw warning on volantis.
...
Change-Id: Id66eb61bdb1ceccfb7aefa0aa70793dac807c257
2014-08-07 14:54:23 -07:00
Michael Lentine
5af281f4ab
Fix HWComposer Surface Crop when surface is rotated
...
Bug: 15091149
Change-Id: I97ecd8af9636da9403fafdb3f9b846f95053ebb7
2014-08-07 13:44:14 -07:00
Michael Lentine
5a35059600
Merge "Fix HWComposer Surface Crop when surface is rotated" into lmp-dev
2014-08-07 15:00:45 +00:00
Brian Carlstrom
bb6adf0d5a
Merge changes Idae36efa,I6613c971 into lmp-dev
...
* changes:
Disable compilation based on vold.decrypt. [frameworks/native]
Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/native]
2014-08-06 23:54:36 +00:00
Brian Carlstrom
41cd9eb424
Disable compilation based on vold.decrypt. [frameworks/native]
...
Bug: 15165413
(cherry picked from commit 538998f204
)
Change-Id: Idae36efa1cb3fb99b51fa0a79b6bb037981d1c71
2014-08-06 21:59:35 -07:00
Brian Carlstrom
9a87db6e1f
Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/native]
...
This will allow us to conditionally change the compiler-filter based on other properties.
Bug: 15165413
(cherry picked from commit cf51ba1360
)
Change-Id: I6613c9710878d56ed8c121e0caded76a64430f76
2014-08-06 21:59:32 -07:00
Brian Carlstrom
1abe557b6e
Merge "Make system use patchoat to relocate during runtime." into lmp-dev
2014-08-06 23:54:36 +00:00
Michael Wright
78f2444aaf
Revert "Revert "Add system accelerators for BACK and HOME.""
...
This reverts commit d671f98a27
.
Change-Id: Ibec48f81653bd2f755fc59a241fa7836baf53233
2014-08-06 16:59:54 -07:00
Alex Light
43c5d30795
Make system use patchoat to relocate during runtime.
...
Make installd understand a patchoat directive and carry it out.
Bug: 15358152
(cherry picked from commit 7365a10689
)
Change-Id: Id84a15e626ddde63876914068d3d9aa037abc65b
2014-08-06 16:27:55 -07:00
Michael Wright
d671f98a27
Revert "Add system accelerators for BACK and HOME."
...
This reverts commit 278b525d25
.
2014-08-06 15:50:43 -07:00
Michael Wright
278b525d25
Add system accelerators for BACK and HOME.
...
Meta+Backspace -> BACK
Meta+Enter -> HOME
Bug: 14066931
Change-Id: Iff1d027300fa9911626785944a6d8efe4f62235e
2014-08-06 19:01:19 +00:00
Aravind Akella
8f3b7ce889
Merge "Sensor related changes for NDK." into lmp-dev
2014-08-05 17:41:31 +00:00
Aravind Akella
b37ba399c1
Sensor related changes for NDK.
...
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
2014-08-05 17:17:51 -07:00
Jean-Michel Trivi
e91cd213d4
AAC codec profile updates
...
Add new fields to OMX_AUDIO_PARAM_AACPROFILETYPE for
- SBR configuration
- decoder max number of channels
- decoder DRC parameters
Bug 16740915
Change-Id: Ib01822bc402fe9064c6c1c68b72c570cf72b7ecb
2014-08-05 22:34:37 +00:00
Rachad
7cb0d39016
Tunneled Video Playback support
...
Added native_window_set_sideband_stream() method to Surface.[h|cpp]
Added ConfigureVideoTunnelModeParams OMX configuration structure to
HardwareAPI.h
Bug: 16132368
Change-Id: I28fa1b9dbe858d93e353e0991098cad45c626bd9
2014-08-04 21:57:22 +00:00
Jeff Tinker
812e039aeb
Merge "Allow device to be unprovisioned" into lmp-dev
2014-08-01 13:51:29 +00:00
Jeff Tinker
bc6b9e7f8a
Allow device to be unprovisioned
...
bug: 12247651
Change-Id: Ib0ec34da708b11a95da66c353d864bb87a6616c9
2014-07-31 10:27:53 -07:00
Michael Lentine
fd9d183cd8
Build fix to use the correct source.
...
Change-Id: If36710be600dd0e15c31682e0343f281baa55627
2014-07-30 15:39:17 -07:00
Michael Lentine
7306c670eb
Add error for format and make sure setActiveConfig fails with an invalid mode.
...
Change-Id: Iacdb5cbad125787f96c64c88d432fc541c4cad1a
2014-07-30 14:36:25 -07:00
Michael Lentine
47e45405d1
Allow for resizing of Virtual Displays.
...
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
2014-07-30 14:36:25 -07:00
Michael Wright
1f6078aef7
Have VirtualDisplays send SF resize messages when resizing
...
Change-Id: I76d15b22099a659450ec875836c9bf2b6584838f
2014-07-30 11:23:44 -07:00
Michael Lentine
99c7dc596a
Merge "Modified SurfaceFlinger to implment setActiveConfig and getActiveConfig." into lmp-dev
2014-07-30 16:17:51 +00:00
Eric Penner
a02e9484be
Merge "SurfaceFlinger: Prevent deadlock by updating an atomic layer set." into lmp-dev
2014-07-29 21:36:00 +00:00
Eric Penner
51c59cd1e7
SurfaceFlinger: Prevent deadlock by updating an atomic layer set.
...
Bug: 12934849
Change-Id: I9dede7316f1e967de4140bd731ac810115ea302f
2014-07-30 19:05:38 -07:00
Aravind Akella
68fd9e7126
Merge "Sensor.cpp changes." into lmp-dev
2014-07-30 23:34:26 +00:00
Aravind Akella
64ffcb0944
Sensor.cpp changes.
...
1) Rename TILT_DETECTOR
2) Set mFlags correctly for wake-up sensors.
2) Log errors for incorrect sensor flags.
Change-Id: Ia449217d3b8a53353ad6b5c33c544ce37eb1de4f
2014-07-31 09:40:03 -07:00