OSDN Git Service
Siva Velusamy [Tue, 20 Nov 2012 21:39:57 +0000 (13:39 -0800)]
gltrace: Make sure device is debuggable.
Change-Id: Icc22ff823a2f56733b232b927dd1fa494e9e1e81
Mathias Agopian [Tue, 20 Nov 2012 15:16:13 +0000 (07:16 -0800)]
am
b171fe9f: am
594a8773: am
764c197c: fix typo that broke all the builds
* commit '
b171fe9f47f0082dae55d5a08fe9b379cbd8e33c':
fix typo that broke all the builds
Mathias Agopian [Tue, 20 Nov 2012 15:13:12 +0000 (07:13 -0800)]
am
594a8773: am
764c197c: fix typo that broke all the builds
* commit '
594a8773c1ef5632a8eb2ef61a86c319460d4248':
fix typo that broke all the builds
Mathias Agopian [Tue, 20 Nov 2012 00:50:24 +0000 (16:50 -0800)]
fix typo that broke all the builds
cherry pick into master since auto-merger is blocked
Bug:
7584338
Change-Id: Ie7d7c238de1fd224b3b0bae9669a8dcb2f700a79
Mathias Agopian [Tue, 20 Nov 2012 01:04:44 +0000 (17:04 -0800)]
am
764c197c: fix typo that broke all the builds
* commit '
764c197c6fc2bf10b038c33b320a4e95594d52d8':
fix typo that broke all the builds
Mathias Agopian [Tue, 20 Nov 2012 00:50:24 +0000 (16:50 -0800)]
fix typo that broke all the builds
Bug:
7584338
Change-Id: Ieb8c27a544ac583af9aa1e0376e33a673d2d9673
Jamie Gennis [Tue, 20 Nov 2012 00:37:42 +0000 (16:37 -0800)]
Merge "SurfaceFlinger: track the HWC retire fences"
Mathias Agopian [Mon, 19 Nov 2012 23:24:52 +0000 (15:24 -0800)]
am
c763303e: (-s ours) am
92c3a307: am
3e095b25: workaround: don\'t reset compositionType to HWC_FRAMEBUFFER [DO NOT MERGE]
* commit '
c763303eca5acf56a6d45157106d6277fb0887ab':
workaround: don't reset compositionType to HWC_FRAMEBUFFER [DO NOT MERGE]
Mathias Agopian [Mon, 19 Nov 2012 23:23:36 +0000 (15:23 -0800)]
am
92c3a307: am
3e095b25: workaround: don\'t reset compositionType to HWC_FRAMEBUFFER [DO NOT MERGE]
* commit '
92c3a307d3ce3ec7a8808d6a2cbb324c0526ac5b':
workaround: don't reset compositionType to HWC_FRAMEBUFFER [DO NOT MERGE]
Mathias Agopian [Mon, 19 Nov 2012 23:22:04 +0000 (15:22 -0800)]
am
3e095b25: workaround: don\'t reset compositionType to HWC_FRAMEBUFFER [DO NOT MERGE]
* commit '
3e095b251503d71bea04d6b707e8188cd30034e2':
workaround: don't reset compositionType to HWC_FRAMEBUFFER [DO NOT MERGE]
Mathias Agopian [Mon, 19 Nov 2012 23:17:27 +0000 (15:17 -0800)]
am
c208cdd4: am
1d3612f1: am
2a8c49eb: fix an out-of-bounds memory access
* commit '
c208cdd402d767228a34074d589c6368cc656b7d':
fix an out-of-bounds memory access
Mathias Agopian [Mon, 19 Nov 2012 23:14:08 +0000 (15:14 -0800)]
am
1d3612f1: am
2a8c49eb: fix an out-of-bounds memory access
* commit '
1d3612f11cb0a56062059dad4643657750c23aab':
fix an out-of-bounds memory access
Mathias Agopian [Mon, 19 Nov 2012 23:07:33 +0000 (15:07 -0800)]
workaround: don't reset compositionType to HWC_FRAMEBUFFER [DO NOT MERGE]
This workaround a HWC HAL issue in Nexus 7, which causes videos and live
wallpapers to animate slowly.
Bug:
7563862
Change-Id: I16ad85317e3e7f47f005e7397357c14186b0a13d
Mathias Agopian [Mon, 19 Nov 2012 22:36:43 +0000 (14:36 -0800)]
am
2a8c49eb: fix an out-of-bounds memory access
* commit '
2a8c49eb5dd51b2e60c9a78bea00870867d91c03':
fix an out-of-bounds memory access
Jamie Gennis [Mon, 12 Nov 2012 00:24:33 +0000 (16:24 -0800)]
SurfaceFlinger: track the HWC retire fences
This change adds functionality to the HWComposer class to track the retire
fences returned by each hwc set call. It adds the HWComposer::getDisplayFence
method to allow other parts of SurfaceFlinger to get a fence that will signal
when the most recent flip takes effect on a display.
Change-Id: I676e0f98440fc58ed70908aa1a1e2ee3e7bf9eb2
Mathias Agopian [Fri, 16 Nov 2012 01:19:48 +0000 (17:19 -0800)]
fix an out-of-bounds memory access
in this particular case, this OOB is always harmless
(and that's why it didn't get fixed from MR1), however,
it interfers with valgrind debugging.
Change-Id: Ic977e03287e59c4b124a89146c9023bd0cb540a8
Mathias Agopian [Thu, 15 Nov 2012 01:00:58 +0000 (17:00 -0800)]
am
35d39886: am
f9730c3b: am
ee932d0a: Reset compositionType to HWC_FRAMEBUFFER before calling prepare()
* commit '
35d3988616cc40c0975d82f166c641109b787a58':
Reset compositionType to HWC_FRAMEBUFFER before calling prepare()
Mathias Agopian [Thu, 15 Nov 2012 00:59:03 +0000 (16:59 -0800)]
am
f9730c3b: am
ee932d0a: Reset compositionType to HWC_FRAMEBUFFER before calling prepare()
* commit '
f9730c3b9655c32fc7ea13159ac5ff2f90fda3f1':
Reset compositionType to HWC_FRAMEBUFFER before calling prepare()
Mathias Agopian [Thu, 15 Nov 2012 00:56:35 +0000 (16:56 -0800)]
am
ee932d0a: Reset compositionType to HWC_FRAMEBUFFER before calling prepare()
* commit '
ee932d0ad1a16cc93b4bd9eaf9cb3cc756fb2dfc':
Reset compositionType to HWC_FRAMEBUFFER before calling prepare()
Kenny Root [Wed, 14 Nov 2012 23:42:38 +0000 (15:42 -0800)]
Switch keystore to binder
Change-Id: Ie15781de079e8ecc9616cab9a5e392f5c814d9d8
Mathias Agopian [Wed, 14 Nov 2012 22:41:42 +0000 (14:41 -0800)]
Reset compositionType to HWC_FRAMEBUFFER before calling prepare()
Honor the documentation. this broke in JB-MR1.
Change-Id: I841a93b409fc940374bc748c4e143d82a192669c
The Android Open Source Project [Wed, 14 Nov 2012 20:44:56 +0000 (12:44 -0800)]
am
11dd4b99: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '
11dd4b998dfadf5a7eeaec5228cfb6100c855608':
The Android Open Source Project [Wed, 14 Nov 2012 20:41:05 +0000 (12:41 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I7915c2abffbc99177c1fec8cf47dfd5c43d88d20
The Android Automerger [Wed, 14 Nov 2012 19:28:21 +0000 (11:28 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
rpcraig [Wed, 14 Nov 2012 18:42:28 +0000 (10:42 -0800)]
Bug fix on installd with SELinux enabled kernel.
setfilecon is not required on libsymlinks when target
doesn't exist. A bootloop is caused without this
change.
Change-Id: Ia895d9063f42885a3db6e8ca30cee5dceb8c1bac
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
Jesse Hall [Mon, 12 Nov 2012 17:58:12 +0000 (09:58 -0800)]
Merge "Create builtin display tokens on demand"
Andy McFadden [Sat, 10 Nov 2012 06:49:18 +0000 (22:49 -0800)]
am
41f7736a: am
434e21bf: am
3fdeb48e: Reduce emulator logspam
* commit '
41f7736ad1e72df8796416a82ce3cede6193d1eb':
Reduce emulator logspam
Andy McFadden [Sat, 10 Nov 2012 06:45:13 +0000 (22:45 -0800)]
am
434e21bf: am
3fdeb48e: Reduce emulator logspam
* commit '
434e21bfd6b14f8d99b9bcdb829e7252edd574f3':
Reduce emulator logspam
Andy McFadden [Sat, 10 Nov 2012 06:41:48 +0000 (22:41 -0800)]
am
3fdeb48e: Reduce emulator logspam
* commit '
3fdeb48e3c89be15fe3b539a26ec9a3cf28c898c':
Reduce emulator logspam
Jesse Hall [Thu, 8 Nov 2012 23:41:56 +0000 (15:41 -0800)]
Create builtin display tokens on demand
For hotpluggable builtin displays (currently just HDMI), create the
display device IBinder token when the display is connected and destroy
it when the display is disconnected. Previously we created the tokens
at startup and never changed them. This made it so that when comparing
current and drawing state, we couldn't tell whether a display had been
disconnected and reconnected.
Bug:
7491120
Change-Id: I23b77037dc0f548d549abf580339edd0e3c626e9
Andy McFadden [Mon, 29 Oct 2012 23:49:44 +0000 (16:49 -0700)]
Reduce emulator logspam
The emulator doesn't support systrace, but we should point that out
at most once per process.
Bug
7436352
Change-Id: I06b2c1ea0df6c02c11cd2496423c337f8d7c62a1
Dmitry Shmidt [Thu, 8 Nov 2012 23:59:28 +0000 (15:59 -0800)]
am
77622879: am
4bacaec4: am
0b2c9268: bugreport: Add /proc/interrupts dump
* commit '
77622879a6a12c6cb916df46c919dde87656e6df':
bugreport: Add /proc/interrupts dump
Dmitry Shmidt [Thu, 8 Nov 2012 23:59:27 +0000 (15:59 -0800)]
am
af9e8a59: am
61db92e7: am
c11f56e5: bugreport: Add wlan FW counters dump for bcmdhd
* commit '
af9e8a59619ec6050739dd68ea108cc7e182d059':
bugreport: Add wlan FW counters dump for bcmdhd
Dmitry Shmidt [Thu, 8 Nov 2012 23:43:05 +0000 (15:43 -0800)]
am
4bacaec4: am
0b2c9268: bugreport: Add /proc/interrupts dump
* commit '
4bacaec4cd5844d67bfa4659393cb7e7fe343d1e':
bugreport: Add /proc/interrupts dump
Dmitry Shmidt [Thu, 8 Nov 2012 23:43:04 +0000 (15:43 -0800)]
am
61db92e7: am
c11f56e5: bugreport: Add wlan FW counters dump for bcmdhd
* commit '
61db92e72771a42456a3b703f275c4a4e1f8b552':
bugreport: Add wlan FW counters dump for bcmdhd
Dmitry Shmidt [Wed, 7 Nov 2012 22:37:14 +0000 (14:37 -0800)]
am
0b2c9268: bugreport: Add /proc/interrupts dump
* commit '
0b2c9268265e9a165551eaa66cb461d3fab8b564':
bugreport: Add /proc/interrupts dump
Dmitry Shmidt [Wed, 7 Nov 2012 22:37:11 +0000 (14:37 -0800)]
am
c11f56e5: bugreport: Add wlan FW counters dump for bcmdhd
* commit '
c11f56e5615c5d388c072705322df5bcf22c2012':
bugreport: Add wlan FW counters dump for bcmdhd
Colin Cross [Wed, 7 Nov 2012 19:25:31 +0000 (11:25 -0800)]
dumpstate: fix incorrectly zeroed array
Change-Id: I55a916568baf66629b02a6d80fce34b84ffb3a34
Dmitry Shmidt [Wed, 7 Nov 2012 19:09:46 +0000 (11:09 -0800)]
bugreport: Add /proc/interrupts dump
Bug:
7301178
Change-Id: Ifad3b981ac904d4637d69dfc223d5bb2c9d80bda
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Dmitry Shmidt [Wed, 7 Nov 2012 18:42:05 +0000 (10:42 -0800)]
bugreport: Add wlan FW counters dump for bcmdhd
Bug:
7494877
Change-Id: I4d24dbcf7596777ec02ab1312c2ab996ba7688f1
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Ben Cheng [Wed, 7 Nov 2012 07:11:35 +0000 (23:11 -0800)]
Disable ld --fatal-warnings because of using mktemp.
Change-Id: Id18b1e38672294b025bc26adb38aed0ac3e0fb45
Andrew Hsieh [Wed, 7 Nov 2012 04:46:17 +0000 (20:46 -0800)]
am
168dfe71: am
5e530e02: am
a151a19d: Merge "Fix return type of glGetAttribLocation and glGetUniformLocation"
* commit '
168dfe71bfafebaa26b6f75df553f5fad7607669':
Fix return type of glGetAttribLocation and glGetUniformLocation
Andrew Hsieh [Wed, 7 Nov 2012 04:43:06 +0000 (20:43 -0800)]
am
5e530e02: am
a151a19d: Merge "Fix return type of glGetAttribLocation and glGetUniformLocation"
* commit '
5e530e02bc3073a2e2469df3c333ae14f1b37433':
Fix return type of glGetAttribLocation and glGetUniformLocation
Andrew Hsieh [Wed, 7 Nov 2012 04:41:34 +0000 (20:41 -0800)]
am
a151a19d: Merge "Fix return type of glGetAttribLocation and glGetUniformLocation"
* commit '
a151a19db2fa07295837027fb5d84c02401cc78d':
Fix return type of glGetAttribLocation and glGetUniformLocation
Andrew Hsieh [Wed, 7 Nov 2012 04:16:14 +0000 (20:16 -0800)]
Merge "Fix return type of glGetAttribLocation and glGetUniformLocation"
Andrew Hsieh [Tue, 6 Nov 2012 21:42:48 +0000 (13:42 -0800)]
Fix return type of glGetAttribLocation and glGetUniformLocation
from int to GLint.
See:
http://www.khronos.org/opengles/sdk/docs/man/xhtml/glGetAttribLocation.xml
http://www.khronos.org/opengles/sdk/docs/man/xhtml/glGetUniformLocation.xml
Change-Id: I4a9f8e9e34b8c3cca239ae84bfe8f3cdfd94802a
The Android Open Source Project [Tue, 6 Nov 2012 20:40:10 +0000 (12:40 -0800)]
am
c2e5b273: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '
c2e5b273c43e3d1649c5f8cecb47c7d84afb6f6e':
The Android Open Source Project [Tue, 6 Nov 2012 20:37:30 +0000 (12:37 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: Ic4f86f5a85ccb35cb054ba6294756456cde4b493
The Android Open Source Project [Tue, 6 Nov 2012 20:29:10 +0000 (12:29 -0800)]
am
1509a46a: (-s ours) am
20152ac7: am
d8e8e662: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
1509a46a860060f7630c5c58d7d08695f7350dc2':
The Android Open Source Project [Tue, 6 Nov 2012 20:24:34 +0000 (12:24 -0800)]
am
20152ac7: am
d8e8e662: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
20152ac797ab3a26561eb23ce672137c9e24ac8c':
The Android Open Source Project [Tue, 6 Nov 2012 20:20:29 +0000 (12:20 -0800)]
am
d8e8e662: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
d8e8e66220cd71486a3b545096a1cdc298dee5fd':
partially implement external display clipping
Always set vertex alpha when drawing screenshot layers
SurfaceFlinger: add animation transactions
ugly, temporary, workaroung for a problem where a binder thread spins forever
make sure we don't call into the HWC HAL when not needed
Fix crashes after HDMI disconnect
Fix issue #
7271589: Cannot set Ocean HD live wallpaper
Revert "Compatibility work around for bad graphics driver dependency."
only abort when errors happen on the main display
Check that HWC exists before trying to use it
Always reset layer acquireFenceFd after commit
fix a problem where all hwc layers would have the SKIP flags set
we were sometimes not setting fences properly
A vendor ril depends on a native screen shot code.
Revert "Added display initialization method"
fix various issues in SF's EventThread
Revert "SurfaceTexture: inherit from ConsumerBase"
we were mistakenly optimizing out SF's main transactions in some cases
Revert "Minimal changes to support multi-display HWC"
The Android Open Source Project [Tue, 6 Nov 2012 20:17:20 +0000 (12:17 -0800)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I219247f1b0f5d87b4144dc1535039e93fc636a94
The Android Automerger [Tue, 6 Nov 2012 10:25:46 +0000 (02:25 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Automerger [Tue, 6 Nov 2012 02:38:55 +0000 (18:38 -0800)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Mathias Agopian [Tue, 6 Nov 2012 02:19:53 +0000 (18:19 -0800)]
am
731e0331: am
e70fbe8b: am
02b95105: fix transitions from hwc to GLES composition
* commit '
731e0331eb402ec4564b69eaeb8b605a8b800b1b':
fix transitions from hwc to GLES composition
Mathias Agopian [Tue, 6 Nov 2012 02:17:18 +0000 (18:17 -0800)]
am
e70fbe8b: am
02b95105: fix transitions from hwc to GLES composition
* commit '
e70fbe8b32687d9178e828d6023de599be5431c3':
fix transitions from hwc to GLES composition
Mathias Agopian [Tue, 6 Nov 2012 02:15:56 +0000 (18:15 -0800)]
am
02b95105: fix transitions from hwc to GLES composition
* commit '
02b95105754b1859a97e234b79f41489a4677c20':
fix transitions from hwc to GLES composition
Mathias Agopian [Tue, 6 Nov 2012 01:50:57 +0000 (17:50 -0800)]
fix transitions from hwc to GLES composition
If we switched from HWC to GLES but the dirty region was empty
(could happen if the dirty region is outside of the screen for instance), we
need to force a full screen composition.
In this change we ignore the dirty region for the purpose of
rejecting the whole update and we rely on the fact that it will later
be expanded to the whole screen. This was the least risky fix.
Bug:
7467760,
7452931
Change-Id: I2132f2f963b00a3ce7150adadb107b0367b3862e
Igor Murashkin [Mon, 5 Nov 2012 21:47:37 +0000 (13:47 -0800)]
Merge "Change ConsumerBase's FrameAvailableListener to be a weak pointer"
Igor Murashkin [Mon, 29 Oct 2012 20:36:11 +0000 (13:36 -0700)]
Change ConsumerBase's FrameAvailableListener to be a weak pointer
This prevents strong reference cycles when the listener implementation also
holds a strong pointer to the ConsumerBase
Bug:
7425644
Change-Id: I1514b13a32b18d421c902dddebec0765a989c55c
Colin Cross [Sat, 3 Nov 2012 17:18:47 +0000 (10:18 -0700)]
Merge "dumpstate: dump all threads in show_wchan"
Colin Cross [Fri, 2 Nov 2012 22:46:56 +0000 (15:46 -0700)]
dumpstate: dump all threads in show_wchan
for_each_pid only finds processes and not their threads. Add
for_each_tid and call it for show_wchan so we can see where all
threads are blocked in the kernel.
Change-Id: Iffb59f7c2933cecf51cdd358a36e19932c2f24c7
Jeff Brown [Fri, 31 Aug 2012 09:18:38 +0000 (02:18 -0700)]
Allow global transactions to nest.
This change fixes a number of small glitches that can occur when
multiple components in the same process are updating surfaces.
One would expect that updates to disjoint sets of surfaces would
not collide but this is not the case. The first component to
close the global transaction causes all pending updates to
be applied, including those that another component might not
have finished setting up if it also had an open transaction
at the same time.
Change-Id: I99345958581abbe0e1e325a5bcba37e8941a313a
Jason Simmons [Thu, 25 Oct 2012 22:58:43 +0000 (15:58 -0700)]
Ensure that Vector::erase() returns a valid iterator
Vector::erase may reallocate the Vector's storage while removing an element.
However, erase() calls begin() before calling removeItemsAt(), thus caching
a pointer the the Vector's old storage. If the storage is reallocated,
the iterator returned by erase() will be based on the old storage pointer
and will thus be invalid.
Bug:
7433283
Change-Id: I91980e0fcb5a2e0a55f1a78444a5958037afdbed
Mathias Agopian [Thu, 1 Nov 2012 23:32:01 +0000 (16:32 -0700)]
Merge "rework a bit how we scissor the display"
Mathias Agopian [Wed, 31 Oct 2012 01:08:06 +0000 (18:08 -0700)]
rework a bit how we scissor the display
the scissor rect is now computed once by DisplayDevice
and is combined with the "undefined" region so that
the letter-boxed area of the screen get cleared in
drawWormhole.
Bug:
7149437
Change-Id: Id2f30516a5786f32eace7f876ff32028f954f357
The Android Open Source Project [Wed, 31 Oct 2012 16:22:29 +0000 (09:22 -0700)]
am
e2d4cc28: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
e2d4cc28d72db0d49e61ed4ceeb878436cafb23a':
partially implement external display clipping
Always set vertex alpha when drawing screenshot layers
SurfaceFlinger: add animation transactions
The Android Open Source Project [Wed, 31 Oct 2012 16:16:58 +0000 (09:16 -0700)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I4f96bf28f6585ad8331daeab60e6d23e92cf0c5d
Colin Cross [Tue, 30 Oct 2012 17:11:27 +0000 (10:11 -0700)]
am
5b47c5c5: am
742801c6: am
2281af96: dumpstate: add kernel memory fragmentation unusable index
* commit '
5b47c5c574d8d3bf8e73ea4fd7a08e0d881d461c':
dumpstate: add kernel memory fragmentation unusable index
The Android Automerger [Tue, 30 Oct 2012 15:52:44 +0000 (08:52 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Colin Cross [Tue, 30 Oct 2012 00:10:16 +0000 (17:10 -0700)]
am
742801c6: am
2281af96: dumpstate: add kernel memory fragmentation unusable index
* commit '
742801c625ecb09fbe14e717fa5d580b3957ed4a':
dumpstate: add kernel memory fragmentation unusable index
Colin Cross [Tue, 30 Oct 2012 00:08:14 +0000 (17:08 -0700)]
am
2281af96: dumpstate: add kernel memory fragmentation unusable index
* commit '
2281af967dd840aade7bc55b19ea7df0e6da36f2':
dumpstate: add kernel memory fragmentation unusable index
Raph Levien [Mon, 29 Oct 2012 15:59:54 +0000 (08:59 -0700)]
Merge "Add an LRU cache plus hashing primitives"
Colin Cross [Mon, 29 Oct 2012 05:41:06 +0000 (22:41 -0700)]
dumpstate: add kernel memory fragmentation unusable index
Dump /d/extfrag/unusable_index in bugreports. It shows the
percentage of memory in each zone that is not available for
allocations for each order.
Change-Id: I2af6680cb609887ea7b3d6107d1aa88bd0206b52
Raph Levien [Fri, 26 Oct 2012 06:11:13 +0000 (23:11 -0700)]
Add an LRU cache plus hashing primitives
This patch adds a hashtable-based LRU cache. This should be
significantly higher performance than the GenerationCache it is intended
to replace. It is a large part of the fix for bug
7271109
TextLayoutCache low-level performance issues.
We added a new method to BasicHashtable to detect when rehashing is
needed, because the internal linked list pointers would get invalidated
by that rehashing.
Also, the hash_type specialized to pointers had a small flaw.
Change-Id: I950c2083f96519777b851dbe157100e0a334caec
Mathias Agopian [Wed, 24 Oct 2012 23:29:17 +0000 (16:29 -0700)]
partially implement external display clipping
we perform external display clipping only on the GL
side (ie: not done on the h/w composer side, which is
harder and would be too risky). in practice this means
that WFD will be clipped properly, while HDMI *may* or
may not depending on how hwc is used.
Bug:
7149437
Change-Id: I92d4d04220db72b6ffb134c7fa7a93af569723a5
Jason Simmons [Fri, 26 Oct 2012 01:08:03 +0000 (18:08 -0700)]
am
40cd4515: am
78b4977e: Merge "Ensure that Vector::erase() returns a valid iterator" into jb-mr1-aah-dev
* commit '
40cd45151513ecc02c95e0cc1b40480dd816cdd4':
Ensure that Vector::erase() returns a valid iterator
Jason Simmons [Fri, 26 Oct 2012 01:06:06 +0000 (18:06 -0700)]
am
78b4977e: Merge "Ensure that Vector::erase() returns a valid iterator" into jb-mr1-aah-dev
* commit '
78b4977efd365d2ad7c9227c3a89e65ab60c3260':
Ensure that Vector::erase() returns a valid iterator
Jason Simmons [Fri, 26 Oct 2012 01:03:50 +0000 (18:03 -0700)]
Merge "Ensure that Vector::erase() returns a valid iterator" into jb-mr1-aah-dev
Mathias Agopian [Fri, 26 Oct 2012 00:32:17 +0000 (17:32 -0700)]
am
c0384266: am
f45c5100: partially implement external display clipping
* commit '
c0384266699aadd23a11bcdfd8a92f6dae8bf36c':
partially implement external display clipping
Mathias Agopian [Fri, 26 Oct 2012 00:29:41 +0000 (17:29 -0700)]
am
f45c5100: partially implement external display clipping
* commit '
f45c510009edab4a3e93f8d66b2e30aa26759fed':
partially implement external display clipping
Jason Simmons [Thu, 25 Oct 2012 22:58:43 +0000 (15:58 -0700)]
Ensure that Vector::erase() returns a valid iterator
Vector::erase may reallocate the Vector's storage while removing an element.
However, erase() calls begin() before calling removeItemsAt(), thus caching
a pointer the the Vector's old storage. If the storage is reallocated,
the iterator returned by erase() will be based on the old storage pointer
and will thus be invalid.
Change-Id: I2450c55fd418e6b1c558a4ca7c024573abbaa098
The Android Automerger [Thu, 25 Oct 2012 20:42:23 +0000 (13:42 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Mathias Agopian [Wed, 24 Oct 2012 23:29:17 +0000 (16:29 -0700)]
partially implement external display clipping
we perform external display clipping only on the GL
side (ie: not done on the h/w composer side, which is
harder and would be too risky). in practice this means
that WFD will be clipped properly, while HDMI *may* or
may not depending on how hwc is used.
Bug:
7149437
Change-Id: I92d4d04220db72b6ffb134c7fa7a93af569723a5
Dave Burke [Thu, 25 Oct 2012 18:48:40 +0000 (11:48 -0700)]
am
296cd1cb: am
04075569: Revert "Revert "put back the unused virtuals in Vector<>""
* commit '
296cd1cb9ac7b7ea201662860347755d0349a7de':
Revert "Revert "put back the unused virtuals in Vector<>""
Dave Burke [Thu, 25 Oct 2012 18:45:41 +0000 (11:45 -0700)]
am
04075569: Revert "Revert "put back the unused virtuals in Vector<>""
* commit '
04075569b565c949a6db8b4e8a9f10d281de4d9c':
Revert "Revert "put back the unused virtuals in Vector<>""
Dave Burke [Thu, 25 Oct 2012 00:30:31 +0000 (17:30 -0700)]
Revert "Revert "put back the unused virtuals in Vector<>""
This reverts commit
225c66a48cdc3acef21ee380dc134449749d3cb3
Change-Id: If31a04b81052cbc7dd7bf237c07107c33066d03d
Mike Lockwood [Wed, 24 Oct 2012 19:28:57 +0000 (12:28 -0700)]
More changes to fix PDK build:
move screencap back to frameworks/base
move libdiskusage over from frameworks/base
Change-Id: I8415716634a4cb5b0fae15ef15ff21ee0a08906a
Mike Lockwood [Wed, 24 Oct 2012 18:51:51 +0000 (11:51 -0700)]
Move app_process and system_server back to frameworks/base
due to dependency on libandroid_runtime
Change-Id: Ie30a76ebb57a07ab29dc1b553c0e2dc9ab8d271a
Signed-off-by: Mike Lockwood <lockwood@google.com>
Mike Lockwood [Wed, 24 Oct 2012 17:45:23 +0000 (10:45 -0700)]
Move non-Java commands over from frameworks/base
Change-Id: I0571813c1cfcf66abd36eb9f178fc49b618e88a6
Signed-off-by: Mike Lockwood <lockwood@google.com>
The Android Automerger [Mon, 22 Oct 2012 23:42:08 +0000 (16:42 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Mathias Agopian [Mon, 22 Oct 2012 22:38:00 +0000 (15:38 -0700)]
am
ef36f2a8: am
d17e3b5f: prevent a client from crashing surfaceflinger
* commit '
ef36f2a84cb8478b0baa299d980922ce7824c0b3':
prevent a client from crashing surfaceflinger
Mathias Agopian [Mon, 22 Oct 2012 22:35:51 +0000 (15:35 -0700)]
am
d17e3b5f: prevent a client from crashing surfaceflinger
* commit '
d17e3b5f6cf71eb52bc81f37719254ce08244b34':
prevent a client from crashing surfaceflinger
Mathias Agopian [Mon, 22 Oct 2012 21:27:45 +0000 (14:27 -0700)]
prevent a client from crashing surfaceflinger
a misbehaving or malicious client could cause SF to crash
by providing a "fake" IInterface. we now check the
IInterface we get is our own and local.
Bug:
7278879
Change-Id: Ia19d05902d4b2385c5a16416148378d4998833fd
Jamie Gennis [Mon, 22 Oct 2012 20:57:51 +0000 (13:57 -0700)]
am
3b6055a7: am
ba7dc2db: Merge "SurfaceFlinger: add support for secure displays" into jb-mr1-dev
* commit '
3b6055a7184a2da7bbdd94118a8c6af875bb28b1':
SurfaceFlinger: add support for secure displays
Jamie Gennis [Mon, 22 Oct 2012 20:54:50 +0000 (13:54 -0700)]
am
ba7dc2db: Merge "SurfaceFlinger: add support for secure displays" into jb-mr1-dev
* commit '
ba7dc2db6e93a2407c8c328f2838591b7b760658':
SurfaceFlinger: add support for secure displays
Jamie Gennis [Mon, 22 Oct 2012 20:50:18 +0000 (13:50 -0700)]
Merge "SurfaceFlinger: add support for secure displays" into jb-mr1-dev
Jamie Gennis [Sat, 20 Oct 2012 01:19:11 +0000 (18:19 -0700)]
SurfaceFlinger: add support for secure displays
This change adds support for displays that are not allowed to display surfaces
with the eSecure flag set. All non-virtual displays are considered secure,
while virtual displays have their secure-ness specified at creation time.
Bug:
7368436
Change-Id: I81ad535d2d1e5a7ff78269017e85b111f0098500
Jesse Hall [Mon, 15 Oct 2012 19:38:33 +0000 (12:38 -0700)]
Always set vertex alpha when drawing screenshot layers
The screenshot is a GL_RGB texture, and the GL_REPLACE texture env
mode uses vertex alpha for GL_RGB textures instead of alpha=1.0.
Bug:
7340077
Change-Id: I6fbb907023e48f9c422b15a33da79757d6726840
The Android Automerger [Sun, 21 Oct 2012 06:14:12 +0000 (23:14 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev