Jesse Hall
c3d1889e50
Merge "surfaceflinger: skip composition for empty frames" into klp-modular-dev
2014-08-19 02:43:23 +00:00
Jesse Hall
b7a0549c98
surfaceflinger: skip composition for empty frames
...
By not committing the results of composition for empty frames, we
avoid spitting out series of black frames for virtual displays that
don't have visible layers. We still draw one black frame when going
from having layers to not having any. In particular, this avoids
having a series of empty frames due to re-compositing the primary
display in the period between creating the virtual display and adding
layers to it.
Bug: 16786752
Change-Id: I7e9b2ed2e407d8d49c7af736b447d4c6181b0ad8
2014-08-19 22:15:43 -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
Colin Cross
7477a8a0a3
am b1f0f288
: Merge changes I4cfb3138,I45356c29 into lmp-dev
...
* commit 'b1f0f288e30c0448cabd46d19c60b3bd0d272f74':
atrace: add memory reclaim tracing
atrace: Add IRQ events
2014-08-19 01:48:59 +00:00
Michael Wright
5a7ad73bd2
am 62fbb163
: Shelve InputFlinger for another release. DO NOT MERGE
...
* commit '62fbb16383d6d8268821f947e2c6d0828f7e2b41':
Shelve InputFlinger for another release. DO NOT MERGE
2014-08-19 01:33:52 +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
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
Elliott Hughes
cb3b7ce1d8
am 703b60ce
: Merge "Use gettid directly in binder."
...
* commit '703b60ce39e52d319074adf53704d33f9c16dbbd':
Use gettid directly in binder.
2014-08-18 19:34:22 +00:00
Michael Wright
62fbb16383
Shelve InputFlinger for another release. DO NOT MERGE
...
Change-Id: I0f034a2b8b1d9192f61f5001799bd3aa4b3964c7
2014-08-18 10:17:18 -07:00
The Android Automerger
9c6a8187f4
merge in lmp-release history after reset to c8c5e4c66b
2014-08-18 06:10:33 -07:00
The Android Automerger
bfdad33b0e
merge in lmp-release history after reset to c8c5e4c66b
2014-08-17 07:18:28 -07:00
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
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
Hans Boehm
efc0b35fbd
Merge "Fix CAS argument type."
2014-08-16 04:28:29 +00:00
Hans Boehm
1ddaadb598
Fix CAS argument type.
...
Gcc apparently doesn't check; clang does.
Bug:17067219
Change-Id: I184084a5063131dbc857c63f97e70e78a05e1a76
2014-08-19 13:42:54 -07:00
Elliott Hughes
703b60ce39
Merge "Use gettid directly in binder."
2014-08-16 04:08:14 +00:00
Elliott Hughes
fa6ad07c4e
Use gettid directly in binder.
...
Bug: 17048545
Change-Id: I1df378135961e085a52f6cc5694ad74cd73aac19
2014-08-18 10:38:38 -07:00
Jeff Brown
9612a31003
am c8c5e4c6
: Merge "Add trace tag for power management." into lmp-dev
...
* commit 'c8c5e4c66b858fc41bdb696421eb13c3ea65a238':
Add trace tag for power management.
2014-08-16 03:14:00 +00:00
Jeff Brown
c8c5e4c66b
Merge "Add trace tag for power management." into lmp-dev
2014-08-15 21:23:40 +00:00
Brian Carlstrom
872f605a30
am ca58175c
: Merge "Disable verification based on vold.decrypt. [frameworks/native]"
...
* commit 'ca58175c831376bc052bde2e25d40798f0cf7ea9':
Disable verification based on vold.decrypt. [frameworks/native]
2014-08-15 17:44:30 +00:00
Brian Carlstrom
46ab27e624
am e18987ef
: Disable verification based on vold.decrypt. [frameworks/native]
...
* commit 'e18987efb5e39ca1bed15527b7b82bde55c99669':
Disable verification based on vold.decrypt. [frameworks/native]
2014-08-15 17:20:38 +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
Brian Carlstrom
ca58175c83
Merge "Disable verification based on vold.decrypt. [frameworks/native]"
2014-08-15 05:40:22 +00:00
Brian Carlstrom
f7765c4a17
Disable verification based on vold.decrypt. [frameworks/native]
...
Bug: 15165413
(cherry picked from commit e18987efb5
)
Change-Id: Ie55ef400c9d1f231b3be64248c756ac798a11ffe
2014-08-15 10:05:32 -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
The Android Automerger
5228d9f0a3
merge in lmp-release history after reset to 3b14e5b1f3
2014-08-14 06:11:58 -07:00
The Android Automerger
389c3fd029
merge in lmp-release history after reset to 3b14e5b1f3
2014-08-13 06:12:40 -07:00
Hans Boehm
dc1fb90857
am a0187a9c
: Merge "Revert "Revert "Revert "Revert "Remove incorrect android_atomic_...64 use."""""
...
* commit 'a0187a9c83cb042b4cb92dac59214247bb7affcf':
Revert "Revert "Revert "Revert "Remove incorrect android_atomic_...64 use.""""
2014-08-13 00:19:23 +00:00
Hans Boehm
a0187a9c83
Merge "Revert "Revert "Revert "Revert "Remove incorrect android_atomic_...64 use."""""
2014-08-12 23:11:16 +00:00
Hans Boehm
3effababf2
Revert "Revert "Revert "Revert "Remove incorrect android_atomic_...64 use.""""
...
After fixing b/16874785.
This reverts commit f010a05c7e
.
Change-Id: I1645ca5d6f60595bf5d388913665ce4b8780b26d
2014-08-12 22:56:00 +00:00
The Android Automerger
c1b74405f2
merge in lmp-release history after reset to 3b14e5b1f3
2014-08-12 06:11:31 -07:00
Brian Carlstrom
b0780bfd93
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 13:32:43 -07:00
Andreas Gampe
f12e678d4b
am 1a22eb7b
: Merge "Change an accidental ALOGE to an ALOGV"
...
* commit '1a22eb7ba1062ed1ee35cdb9d797019699cbce8b':
Change an accidental ALOGE to an ALOGV
2014-08-11 20:00:46 +00:00
Brian Carlstrom
c5106fedec
am 3b14e5b1
: Use set_sched_policy to put dexopt operations in SP_BACKGROUND cgroup
...
* commit '3b14e5b1f3fd1f3ef66696dc7ce4e53b6af3c309':
Use set_sched_policy to put dexopt operations in SP_BACKGROUND cgroup
2014-08-11 18:03:05 +00:00
Andreas Gampe
1a22eb7ba1
Merge "Change an accidental ALOGE to an ALOGV"
2014-08-11 18:01:48 +00:00
Narayan Kamath
93b1b9a42c
am 82e98c21
: Merge "Use set_sched_policy to put dexopt operations in SP_BACKGROUND cgroup"
...
* commit '82e98c21f8606e0de8c6beb4372bc4ae9f52b515':
Use set_sched_policy to put dexopt operations in SP_BACKGROUND cgroup
2014-08-11 17:36:11 +00: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
Alex Light
a7915d437c
Change an accidental ALOGE to an ALOGV
...
Change-Id: If07bcef597dd9e531ce6d92c7780ba6ad5090f9a
2014-08-11 10:07:02 -07:00
The Android Automerger
1db4157611
merge in lmp-release history after reset to 7d1cd4aae2
2014-08-11 06:16:02 +00:00
The Android Automerger
be1e46f41f
merge in lmp-release history after reset to 7d1cd4aae2
2014-08-10 06:08:54 -07:00
The Android Automerger
1c04b7d572
merge in lmp-release history after reset to 7d1cd4aae2
2014-08-09 06:09:53 -07:00
Rachad
4f3abf2771
am 7d1cd4aa
: Merge "Tunneled Video Playback support" into lmp-dev
...
* commit '7d1cd4aae2aa42172abdff00ec1601248cf92b02':
Tunneled Video Playback support
2014-08-09 05:14:12 +00:00
Hans Boehm
d87319ddc8
am f491f497
: Merge "Revert "Revert "Revert "Remove incorrect android_atomic_...64 use.""""
...
* commit 'f491f497b2a4ba5a0ec60b291cce4ffb3be3d33c':
Revert "Revert "Revert "Remove incorrect android_atomic_...64 use."""
2014-08-09 02:50:38 +00:00
Hans Boehm
f010a05c7e
Revert "Revert "Revert "Remove incorrect android_atomic_...64 use."""
...
This reverts commit 66629e0de5
.
Change-Id: Ic298b345d0e500d18e4297b00e755ce3340f13fb
2014-08-09 01:17:13 +00:00