Ben Clayton
6c011731d0
am 4c5b9acf
: Merge "Don\'t try to capture the pointer when using PBOs for texture APIs" into lmp-dev
...
* commit '4c5b9acf655531f1be45bf7fffc5ee145a80cca7':
Don't try to capture the pointer when using PBOs for texture APIs
2014-08-20 16:32:37 +00:00
Michael Lentine
d0c20394d2
am 2cfbef25
: Merge "Fix inverse orientation when original is not applied first." into lmp-dev
...
* commit '2cfbef255b0e1b1b8fad3cba0e447d79a7b8203b':
Fix inverse orientation when original is not applied first.
2014-08-20 15:46:34 +00:00
Calin Juravle
fd88ff2edd
Allow apk path to contain one subdirectory.
...
In the current directory layout this prevented rm_dex and move_dex
commands to validate the apk path and thus cleaning up resources.
Bug: 16888084
Change-Id: Iba579d075a9c6d7de047e7ffef95441498257086
2014-08-20 15:37:54 +01:00
Colin Cross
61a4eecbe6
Merge "atrace: avoid unnecessary writes to trace_clock" into lmp-dev
2014-08-20 12:26:29 +00:00
Colin Cross
b1ce49b2ed
atrace: avoid unnecessary writes to trace_clock
...
Writing to trace_clock erases the trace buffer, even if the value
hasn't changed. This prevents use of --async_start and --async_dump
to leave background tracing running and dump after an even that
needs debugging, because --async_dump writes to trace_clock and
resets the buffer before it can read it.
Read and parse the current value from trace_clock before writing,
and skip the write if the value isn't changing.
Change-Id: Ia2ec5bb654fb0bd179771b511ff261731ba47dca
2014-08-20 14:28:47 -07:00
Michael Lentine
1438f6da7e
am 62205596
: Merge "Fix camera orientation by swapping horizontal and vertical flips when needed." into lmp-dev
...
* commit '62205596b9848d9d7d9de90aa0f5682d6ce17ea3':
Fix camera orientation by swapping horizontal and vertical flips when needed.
2014-08-19 23:50:18 +00:00
Vinod Krishnan
1f1ca890d4
Adding an ECG hardware feature
...
Change-Id: I368772d4cd6b2713fb5180bedc91bf2b5bc015b4
2014-08-19 16:02:13 -07:00
Michael Lentine
4d7c41008d
Merge "Destroy eglSurface before recreating." into lmp-dev
2014-08-19 22:53:25 +00:00
Michael Lentine
f2568dea41
Destroy eglSurface before recreating.
...
Bug: 16856208
Change-Id: Ifb5c8997afab4bc922356a3542d1f899a2546855
2014-08-20 10:56:34 -07: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
2cfbef255b
Merge "Fix inverse orientation when original is not applied first." into lmp-dev
2014-08-19 22:53:25 +00:00
Hans Boehm
02a1c2cb37
am efc0b35f
: Merge "Fix CAS argument type."
...
* commit 'efc0b35fbd256bb3e225f4a1b953d0895ee3e99a':
Fix CAS argument type.
2014-08-19 22:28:41 +00:00
Michael Lentine
1b20b8e694
am b3abe7c0
: Merge "Incorporate TransformToDisplayInverse into the crop calculation." into lmp-dev
...
* commit 'b3abe7c06a834d92439d034b29e3b5af632de130':
Incorporate TransformToDisplayInverse into the crop calculation.
2014-08-19 21:13:00 +00:00
Riley Andrews
38e451f057
am 51d3d176
: Merge "Within CpuConsumer, use gralloc lockAsync/unlockAsync" into lmp-dev
...
* commit '51d3d176e35abc8b72e55035b0f7b81388ee044d':
Within CpuConsumer, use gralloc lockAsync/unlockAsync
2014-08-19 21:07:51 +00:00
Aravind Akella
d553ce4092
am a54f3b2f
: Merge "SensorService fixes." into lmp-dev
...
* commit 'a54f3b2f4a1d531bca952b5a10fa8181502ce820':
SensorService fixes.
2014-08-19 20:34:18 +00:00
Riley Andrews
66a9921997
am 86639909
: Take advantage of sync points during screen cap.
...
* commit '866399093f9f60e7305f291e688abb456bace710':
Take advantage of sync points during screen cap.
2014-08-19 20:02:07 +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
Michael Lentine
b3abe7c06a
Merge "Incorporate TransformToDisplayInverse into the crop calculation." into lmp-dev
2014-08-19 15:47:37 +00:00
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
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
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