OSDN Git Service
The Android Open Source Project [Mon, 10 Dec 2012 23:19:43 +0000 (15:19 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I97991f966ea0d3a6f3bad87c82d9926d55e6d63c
The Android Automerger [Fri, 7 Dec 2012 21:26:18 +0000 (13:26 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Jamie Gennis [Fri, 7 Dec 2012 19:07:03 +0000 (11:07 -0800)]
am
d4e70620: am
72c3f7d8: Revert "ConsumerBase: free buffers outside the lock"
* commit '
d4e706208c99ff1716fb0009ec867ff29ff04a7c':
Revert "ConsumerBase: free buffers outside the lock"
Jamie Gennis [Fri, 7 Dec 2012 19:04:51 +0000 (11:04 -0800)]
am
72c3f7d8: Revert "ConsumerBase: free buffers outside the lock"
* commit '
72c3f7d88160b7c279f90f0efe3c1cb12cd140ae':
Revert "ConsumerBase: free buffers outside the lock"
Jamie Gennis [Fri, 7 Dec 2012 18:59:29 +0000 (10:59 -0800)]
am
2d659286: am
2e59d2c3: DO NOT MERGE GraphicBufferAllocator: make frees async
* commit '
2d659286b59dc7ff7378fe967f1c425e92155995':
DO NOT MERGE GraphicBufferAllocator: make frees async
Jamie Gennis [Fri, 7 Dec 2012 18:58:22 +0000 (10:58 -0800)]
am
2e59d2c3: DO NOT MERGE GraphicBufferAllocator: make frees async
* commit '
2e59d2c3fdc0bcfedbe9c5d04d7acadc3eff8887':
DO NOT MERGE GraphicBufferAllocator: make frees async
Jamie Gennis [Fri, 7 Dec 2012 08:41:56 +0000 (00:41 -0800)]
Revert "ConsumerBase: free buffers outside the lock"
This reverts commit
b21a4e3b5f7f07ed160ca6e1809313e2a8e2a6a4.
Jamie Gennis [Fri, 7 Dec 2012 08:38:36 +0000 (00:38 -0800)]
DO NOT MERGE GraphicBufferAllocator: make frees async
This change makes GraphicBufferAllocator::free queue a job to another thread to
perform the actual free operation. This prevents potentially slow free
operations from blocking rendering.
Bug:
7675940
Change-Id: Id61099d66bb4c3949d04184e0d7f192ac18076b4
The Android Open Source Project [Fri, 7 Dec 2012 15:53:15 +0000 (07:53 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: Id716af997b29350c4600ae941107e96d27f1b0af
The Android Automerger [Fri, 7 Dec 2012 03:36:11 +0000 (19:36 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Jamie Gennis [Fri, 7 Dec 2012 03:00:57 +0000 (19:00 -0800)]
am
3ed2736c: am
b21a4e3b: ConsumerBase: free buffers outside the lock
* commit '
3ed2736c10efb2f18062591e308036837d9725a4':
ConsumerBase: free buffers outside the lock
Jamie Gennis [Fri, 7 Dec 2012 02:37:24 +0000 (18:37 -0800)]
am
b21a4e3b: ConsumerBase: free buffers outside the lock
* commit '
b21a4e3b5f7f07ed160ca6e1809313e2a8e2a6a4':
ConsumerBase: free buffers outside the lock
Jamie Gennis [Fri, 7 Dec 2012 01:51:53 +0000 (17:51 -0800)]
ConsumerBase: free buffers outside the lock
This change makes ConsumerBase::onBuffersReleased hold a reference to all its
gralloc buffers until after the mutex is unlocked. This prevents slow
gralloc::free calls from causing lock contention with rendering threads.
Bug:
7675940
Change-Id: I0ec805d1b612afeeecfffec03f982371d27d93be
The Android Open Source Project [Thu, 29 Nov 2012 17:13:38 +0000 (09:13 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I83096147b7adbf5396fdb88114abce568b4ec0cc
The Android Automerger [Thu, 29 Nov 2012 15:09:35 +0000 (07:09 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Open Source Project [Wed, 28 Nov 2012 17:47:35 +0000 (09:47 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I7d22820ba101417d4dd982b642b45d80beb011f4
Mathias Agopian [Wed, 28 Nov 2012 00:10:29 +0000 (16:10 -0800)]
am
98cbec81: am
efd614b8: Merge "make transform hint multi-display aware" into jb-mr1.1-dev
* commit '
98cbec81be1d39223e33abde9ac35e43b62918bf':
make transform hint multi-display aware
Mathias Agopian [Wed, 28 Nov 2012 00:08:43 +0000 (16:08 -0800)]
am
efd614b8: Merge "make transform hint multi-display aware" into jb-mr1.1-dev
* commit '
efd614b869e952792b009db4ab54f3bb4375d198':
make transform hint multi-display aware
Mathias Agopian [Wed, 28 Nov 2012 00:07:04 +0000 (16:07 -0800)]
Merge "make transform hint multi-display aware" into jb-mr1.1-dev
The Android Automerger [Tue, 27 Nov 2012 23:34:35 +0000 (15:34 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Jesse Hall [Tue, 27 Nov 2012 20:59:56 +0000 (12:59 -0800)]
am
2004307b: Merge "Create builtin display tokens on demand"
* commit '
2004307b65c0cb34c854331e5be21d3426a3ef06':
Create builtin display tokens on demand
Jesse Hall [Tue, 27 Nov 2012 20:43:10 +0000 (12:43 -0800)]
Merge "Create builtin display tokens on demand"
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: I2ac82b864e10cb1cd0a308782d7e0ab9745c5d81
Andy McFadden [Tue, 27 Nov 2012 19:39:20 +0000 (11:39 -0800)]
am
a90173d8: am
762a6d86: Merge "DO NOT MERGE - native_fence_sync: fix an enum name" into jb-mr1.1-dev
* commit '
a90173d86dd209aee55d833c73c424d854a98c70':
DO NOT MERGE - native_fence_sync: fix an enum name
Andy McFadden [Tue, 27 Nov 2012 19:31:44 +0000 (11:31 -0800)]
am
762a6d86: Merge "DO NOT MERGE - native_fence_sync: fix an enum name" into jb-mr1.1-dev
* commit '
762a6d86de63ad319884ab6e666be6ad0d75996e':
DO NOT MERGE - native_fence_sync: fix an enum name
Andy McFadden [Tue, 27 Nov 2012 15:36:50 +0000 (07:36 -0800)]
Merge "DO NOT MERGE - native_fence_sync: fix an enum name" into jb-mr1.1-dev
Jamie Gennis [Mon, 26 Nov 2012 21:54:56 +0000 (13:54 -0800)]
DO NOT MERGE - native_fence_sync: fix an enum name
This change replaces all references to the "EGL_NO_NATIVE_FENCE_ANDROID" enum
with "EGL_NO_NATIVE_FENCE_FD_ANDROID".
Bug: http://code.google.com/p/android/issues/detail?id=40295
(cherry-pick from master)
Change-Id: Ie25d4ab9721d8b69b8d4afcf18e902ef8e3ad911
The Android Automerger [Mon, 26 Nov 2012 19:29:02 +0000 (11:29 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Mathias Agopian [Thu, 22 Nov 2012 00:02:13 +0000 (16:02 -0800)]
make transform hint multi-display aware
if a layer is not mirrored, we now use its display
as the source for the transfrom hint calculation
instead of always using the default (main) display.
this change does two thing:
1) we make updateTransformHint take a DisplayDevice
as a parameter instead of hard-coding the
main display.
2) each time we do a transaction that could change
the hint, we go through all layers and
figure out which display should be used for their
transform hint.
Bug:
7599344
Change-Id: I9b04a95e6c372dd770bacf81d8ef6f8e31b87b83
Siva Velusamy [Wed, 21 Nov 2012 04:01:30 +0000 (20:01 -0800)]
am
c859084c: am
a9a4cd48: gltrace: Make sure device is debuggable.
* commit '
c859084ca303ca1ab69bdc78f864d39c9c81ab0b':
gltrace: Make sure device is debuggable.
Siva Velusamy [Wed, 21 Nov 2012 03:59:23 +0000 (19:59 -0800)]
am
a9a4cd48: gltrace: Make sure device is debuggable.
* commit '
a9a4cd4806ea5b2cf525c8ab4c6604d78c6e3f8f':
gltrace: Make sure device is debuggable.
Siva Velusamy [Tue, 20 Nov 2012 21:39:57 +0000 (13:39 -0800)]
gltrace: Make sure device is debuggable.
(cherry picked from commit
6482fa4db0a7ac99cd3503d6bf170f80b26fb695)
Change-Id: I205aabcab1932025c12e7ba3d1b3cf94684f6758
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 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
The Android Automerger [Tue, 20 Nov 2012 00:50:37 +0000 (16:50 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
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
The Android Automerger [Tue, 20 Nov 2012 00:13:13 +0000 (16:13 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
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 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: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
The Android Automerger [Fri, 16 Nov 2012 19:29:32 +0000 (11:29 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
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 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()
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: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
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
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: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
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>
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: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: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: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
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
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
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
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: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: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: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
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: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: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
Andy McFadden [Fri, 19 Oct 2012 23:14:34 +0000 (16:14 -0700)]
am
620685c2: Fix emulator vsync
* commit '
620685c2e684082c82657732d1e35cefd0c79006':
Fix emulator vsync
Andy McFadden [Fri, 19 Oct 2012 19:53:46 +0000 (12:53 -0700)]
Fix emulator vsync
The code that reserves display IDs was only run when a hardware
composer was present. The eventControl() function, which handles
enabling of vsync, was ignoring the request because the primary
display didn't appear in its set of allocated IDs. This moves
reservation of IDs for built-in displays outside the HWC-only block.
Also, added a couple of warnings in eventControl().
Bug
7376568
Change-Id: I185ccdf817a25499b5c2668f8f6d594afb8c1568
The Android Automerger [Fri, 19 Oct 2012 13:59:39 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Romain Guy [Fri, 19 Oct 2012 00:37:54 +0000 (17:37 -0700)]
am
60393d45: Merge "Add runtime debugging capabilities to OpenGL" into jb-mr1-dev
* commit '
60393d45207b6548e1f61ca104fa59aecee87d30':
Add runtime debugging capabilities to OpenGL
Romain Guy [Fri, 19 Oct 2012 00:33:36 +0000 (17:33 -0700)]
Merge "Add runtime debugging capabilities to OpenGL" into jb-mr1-dev
Romain Guy [Thu, 18 Oct 2012 23:16:10 +0000 (16:16 -0700)]
Add runtime debugging capabilities to OpenGL
The shell property debug.egl.trace can now be set to:
0
disables tracing
1
logs all GL calls
error
checks glGetError after every GL call, logs a stack trace on error
systrace
logs each GL call to systrace
Change-Id: I34a2a2d4e19c373fd9eaa1b0cd93e67c87378996