OSDN Git Service
Chad Jones [Thu, 29 Nov 2012 22:50:16 +0000 (14:50 -0800)]
Merge "Add the atrace utility."
Jesse Hall [Thu, 29 Nov 2012 22:21:48 +0000 (14:21 -0800)]
Merge "Initial draft of EGL_ANDROID_image_native_buffer"
Alex Ray [Thu, 29 Nov 2012 21:36:25 +0000 (13:36 -0800)]
Merge "utils: Use cutils tracing functionality."
Alex Ray [Thu, 15 Nov 2012 01:28:10 +0000 (17:28 -0800)]
utils: Use cutils tracing functionality.
Tracing functionality has moved to cutils.
Change-Id: Ie78ccc1d59dd5178f5058fbc3858a37f9adce552
Jesse Hall [Thu, 29 Nov 2012 00:18:03 +0000 (16:18 -0800)]
Initial draft of EGL_ANDROID_image_native_buffer
Change-Id: If9bdd27ffdb13fb85e9ef873b311d6721399f75f
Romain Guy [Thu, 29 Nov 2012 19:23:12 +0000 (11:23 -0800)]
Merge "Add LruCache::Iterator"
The Android Open Source Project [Thu, 29 Nov 2012 17:49:34 +0000 (09:49 -0800)]
am
6d93da46: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '
6d93da465ab8fff02728f268785e59ab86a2a0c2':
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
Romain Guy [Thu, 29 Nov 2012 02:26:54 +0000 (18:26 -0800)]
Add LruCache::Iterator
Required by libhwui
Change-Id: I164b9a4a82d89d132da01a56535c0df084de86f7
Romain Guy [Thu, 29 Nov 2012 01:37:03 +0000 (17:37 -0800)]
Add another ifndef and a couple of methods to LruCache
The new methods on LruCache are needed by libhwui to manage
the cache of paths.
Change-Id: If54fa325c54e2b04e7fe5dfe6dad66066c40127c
Romain Guy [Wed, 28 Nov 2012 20:59:40 +0000 (12:59 -0800)]
Add #ifndef to prevent multiple definitions
Change-Id: Ib861eee0f333fe29290437b7e67623622d8dabd0
The Android Open Source Project [Wed, 28 Nov 2012 17:49:34 +0000 (09:49 -0800)]
am
31e84850: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '
31e8485028e93c16312c57b5bb6b511e3bc8582d':
workaround: don't reset compositionType to HWC_FRAMEBUFFER [DO NOT MERGE]
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 02:43:52 +0000 (18:43 -0800)]
am
a7da0dda: am
98cbec81: am
efd614b8: Merge "make transform hint multi-display aware" into jb-mr1.1-dev
* commit '
a7da0dda39cf1e807eea1304b48d4583e7329b72':
make transform hint multi-display aware
Jesse Hall [Wed, 28 Nov 2012 02:42:41 +0000 (18:42 -0800)]
am
1e310d64: am
2004307b: Merge "Create builtin display tokens on demand"
* commit '
1e310d64d1e51faf35962f23da1c90ec95a35e5d':
Create builtin display tokens on demand
Andy McFadden [Wed, 28 Nov 2012 01:34:20 +0000 (17:34 -0800)]
am
db2e4f16: (-s ours) am
a90173d8: am
762a6d86: Merge "DO NOT MERGE - native_fence_sync: fix an enum name" into jb-mr1.1-dev
* commit '
db2e4f16bb1c804414773862030cdb0aa5413778':
DO NOT MERGE - native_fence_sync: fix an enum name
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
Jamie Gennis [Mon, 26 Nov 2012 22:12:12 +0000 (14:12 -0800)]
Merge "native_fence_sync: fix an enum name"
Jamie Gennis [Mon, 26 Nov 2012 21:54:56 +0000 (13:54 -0800)]
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
Change-Id: I049b2ba185c2dbdccb8fc069701dbe805d63f645
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:14:14 +0000 (20:14 -0800)]
am
0e34af62: am
c859084c: am
a9a4cd48: gltrace: Make sure device is debuggable.
* commit '
0e34af6284c258c1dc56670a573ef11a76dda9fe':
gltrace: Make sure device is debuggable.
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
Siva Velusamy [Tue, 20 Nov 2012 23:37:51 +0000 (15:37 -0800)]
Merge "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.
Change-Id: Icc22ff823a2f56733b232b927dd1fa494e9e1e81
Jamie Gennis [Tue, 20 Nov 2012 20:20:51 +0000 (12:20 -0800)]
Merge "SurfaceFlinger: refactor frame time tracking"
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
Jamie Gennis [Fri, 9 Nov 2012 03:23:28 +0000 (19:23 -0800)]
SurfaceFlinger: refactor frame time tracking
This change moves the frame time history tracking code out of Layer and into a
new class called FrameTracker. It also changes the tracking to use signal
timestamps from fences when available for more accurate results.
Change-Id: I323c5f075c58bf86ce363b52af885ad0f6365f2b
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
Jamie Gennis [Tue, 20 Nov 2012 00:37:42 +0000 (16:37 -0800)]
Merge "SurfaceFlinger: track the HWC retire fences"
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: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
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 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