Jesse Hall
83e7c8c431
Implement the EGL_KHR_fence_sync in libagl
...
Implementing this in libagl allows us to start using it for
SurfaceTexture in emulator builds, which is necessary to avoid
corruption in the Browser when using the host-accelerated GL path.
Bug: 6515813
Change-Id: Icafba8687cb5d010d8d42b3866b298d2be984fc9
2012-05-22 12:11:41 -07:00
The Android Automerger
80bfdb06b8
merge in jb-release history after reset to jb-dev
2012-05-22 07:05:42 -07:00
Mathias Agopian
ae5df74c32
am 4ae4e6f2
: am cc2b1560
: fix EGL_CLIENT_STRING
...
* commit '4ae4e6f2da480b31b5e545e9179cb6881893d7b9':
fix EGL_CLIENT_STRING
2012-05-21 14:32:58 -07:00
The Android Open Source Project
b19c17f8a5
am 3d8added
: Reconcile with jb-release nakasi-factoryrom-release
...
* commit '3d8addedff14f2b85f89eb1a2ea24edb249a470b':
2012-05-21 14:28:46 -07:00
Mathias Agopian
69df645759
am 83f1d839
: am 7e477bfe
: make sure BufferQueue releases newly acquired buffers on failures
...
* commit '83f1d83975345bada9886e9ea0ef2b950d90cd77':
make sure BufferQueue releases newly acquired buffers on failures
2012-05-21 14:27:29 -07:00
Mathias Agopian
4ae4e6f2da
am cc2b1560
: fix EGL_CLIENT_STRING
...
* commit 'cc2b1560e87369676a2d13f17bd1ff4021a91819':
fix EGL_CLIENT_STRING
2012-05-21 14:15:00 -07:00
Mathias Agopian
49b97c857e
am ac4a4825
: am f899e411
: Remove misleading and wrong ALOGW
...
* commit 'ac4a48251180a79ae19e3a7112537c3d0fa260c6':
Remove misleading and wrong ALOGW
2012-05-21 14:11:46 -07:00
Mathias Agopian
ff5ed84178
am 1783e6f2
: am ed9807bd
: we need to wait for vsync when doing the screen-off animation
...
* commit '1783e6f2e1f4543590009c36c83a79f4c42b3c9e':
we need to wait for vsync when doing the screen-off animation
2012-05-21 14:11:41 -07:00
Mathias Agopian
cc2b1560e8
fix EGL_CLIENT_STRING
...
it should read OpenGL_ES (with an underscore)
Bug: 6529643
Change-Id: I7caf07793bffe5a8dcceaff496a222077486fc87
2012-05-21 14:02:53 -07:00
Jeff Sharkey
4d4079b984
am 82e7812a
: am a66faaa6
: Merge "Dump packages.xml as root." into jb-dev
...
* commit '82e7812ab1e09170106a836c143365b3662ff823':
Dump packages.xml as root.
2012-05-21 12:45:09 -07:00
Mathias Agopian
455961ef65
am e0607f05
: am 5aed6843
: Merge "fix a corruption in Vector<> when adding new items" into jb-dev
...
* commit 'e0607f0507fe647bd9262facfaf75146c074e933':
fix a corruption in Vector<> when adding new items
2012-05-21 12:43:25 -07:00
Jesse Hall
f336014c8d
am bd56aabb
: am 515f19da
: Merge "Recreate EGLImage for previously used slots" into jb-dev
...
* commit 'bd56aabb92097546073c8dd8949bb03161e72c56':
Recreate EGLImage for previously used slots
2012-05-21 12:41:02 -07:00
JP Abgrall
a0ecf86e5d
am e91f0a96
: am 81f6da52
: Merge "dumpstate: collect xtables based iface stats, update iptables info." into jb-dev
...
* commit 'e91f0a967b15af2a4a1e4ec2af8464dfca3560de':
dumpstate: collect xtables based iface stats, update iptables info.
2012-05-21 12:40:35 -07:00
The Android Automerger
be08a243d1
merge in jb-release history after reset to jb-dev
2012-05-20 07:39:46 -07:00
The Android Open Source Project
3d8addedff
Reconcile with jb-release nakasi-factoryrom-release
...
Change-Id: I42366ee22738eac90627669da9bb03ec8b598724
2012-05-18 18:43:36 -07:00
Mathias Agopian
83f1d83975
am 7e477bfe
: make sure BufferQueue releases newly acquired buffers on failures
...
* commit '7e477bfe11f8bb31622353b64e85721df3cf9702':
make sure BufferQueue releases newly acquired buffers on failures
2012-05-18 17:11:23 -07:00
Mathias Agopian
7e477bfe11
make sure BufferQueue releases newly acquired buffers on failures
...
this prevents SurfaceTexture producer to hang in dequeueBuffer()
when something goes wrong in the consumer.
only the consumer gets an error and the current frame is kept
instead of the new one. the producer is unaware of the problem.
Bug: 6476587
Change-Id: Ie6db5526632aabc3e60229b93dfe29c19491ade4
2012-05-18 16:50:58 -07:00
Mathias Agopian
ac4a482511
am f899e411
: Remove misleading and wrong ALOGW
...
* commit 'f899e4113a5b5545cd91b4625514d0ab0d33751c':
Remove misleading and wrong ALOGW
2012-05-18 15:59:24 -07:00
Mathias Agopian
1783e6f2e1
am ed9807bd
: we need to wait for vsync when doing the screen-off animation
...
* commit 'ed9807bd7dbd4863841e251138392c54755eb394':
we need to wait for vsync when doing the screen-off animation
2012-05-18 15:59:23 -07:00
Mathias Agopian
f899e4113a
Remove misleading and wrong ALOGW
...
Bug: 6476587
Change-Id: I4345f1100db02786bb50ad83ca7b559cad301706
2012-05-18 15:32:28 -07:00
Mathias Agopian
ed9807bd7d
we need to wait for vsync when doing the screen-off animation
...
Bug: 6511421
Change-Id: I7a85a55e66a3a8d9937df575e98a5efec01a634f
2012-05-18 14:30:40 -07:00
Jeff Sharkey
82e7812ab1
am a66faaa6
: Merge "Dump packages.xml as root." into jb-dev
...
* commit 'a66faaa65a235e24e78f75c79cc3bd209b67e1f8':
Dump packages.xml as root.
2012-05-18 14:21:40 -07:00
Jeff Sharkey
a66faaa65a
Merge "Dump packages.xml as root." into jb-dev
2012-05-18 11:40:49 -07:00
The Android Automerger
4784b6c428
merge in nakasi-factoryrom-release history after reset to jb-dev
2012-05-18 10:47:59 -07:00
Mathias Agopian
ae31834819
am 35fb5e36
: am f17fdcaf
: Merge changes I9f3cbbe0,I12a6f9a9 into jb-dev
...
* commit '35fb5e3638546d48b47dd8da9a90a1af85c4e4b1':
Fix "Battery/Status/Clock status bar area flickers when dragging down"
minor refactoring in praparation of crop fix
2012-05-17 20:56:48 -07:00
Mathias Agopian
e0607f0507
am 5aed6843
: Merge "fix a corruption in Vector<> when adding new items" into jb-dev
...
* commit '5aed68434d11d609039a89594ad5faa01060a1d6':
fix a corruption in Vector<> when adding new items
2012-05-17 17:49:46 -07:00
Mathias Agopian
5aed68434d
Merge "fix a corruption in Vector<> when adding new items" into jb-dev
2012-05-17 17:48:09 -07:00
Mathias Agopian
a9611c5d5b
fix a corruption in Vector<> when adding new items
...
would happen when vectors are copied and new items is
added in both vectors. we didn't duplicate the underlying
storage when adding items in vectors.
Bug: 6515797
Change-Id: If544c07d96c05821e088d7f2c9b5736f7e306c31
2012-05-17 17:47:44 -07:00
Siva Velusamy
7d8fa3b86e
am 1644148b
: am f34ec7a4
: Merge "gltrace: Allow receiving commands of length > 4" into jb-dev
...
* commit '1644148b002825905c7db11ee53f7af0d83f6144':
gltrace: Allow receiving commands of length > 4
2012-05-17 15:33:27 -07:00
Jeff Sharkey
13461c2ffe
Dump packages.xml as root.
...
Bug: 6501151
Change-Id: Ied638bdbe9ed6fbf749a44de8ac1f9d4167829c1
2012-05-17 13:03:34 -07:00
Jesse Hall
bd56aabb92
am 515f19da
: Merge "Recreate EGLImage for previously used slots" into jb-dev
...
* commit '515f19da246a11c417c1771d4293e753f09e79b6':
Recreate EGLImage for previously used slots
2012-05-17 12:09:50 -07:00
Jesse Hall
515f19da24
Merge "Recreate EGLImage for previously used slots" into jb-dev
2012-05-17 12:07:39 -07:00
Jesse Hall
90ed8508ed
Recreate EGLImage for previously used slots
...
SurfaceTexture would only create an EGLImage for a buffer slot when
BufferQueue returns a GraphicBuffer, i.e. either the slot was acquired
for the first time ever, or the buffer for the slot was reallocated.
But the EGLImage may also need to be re-created for a
previously-acquired buffer if the slot's EGLImage was destroyed during
detachFromContext(); in this case BufferQueue won't return a
GraphicBuffer since SurfaceTexture already has a reference to the
correct buffer.
Bug: 6461693
Change-Id: Ib95d0d757192efe336c5fda0866f857481a6617d
2012-05-17 11:25:21 -07:00
JP Abgrall
e91f0a967b
am 81f6da52
: Merge "dumpstate: collect xtables based iface stats, update iptables info." into jb-dev
...
* commit '81f6da5228aeca22894b0277cd2050fccdb7cccb':
dumpstate: collect xtables based iface stats, update iptables info.
2012-05-17 11:06:01 -07:00
JP Abgrall
81f6da5228
Merge "dumpstate: collect xtables based iface stats, update iptables info." into jb-dev
2012-05-17 11:04:07 -07:00
The Android Automerger
0cd6a4f875
merge in jb-release history after reset to jb-dev
2012-05-17 07:03:31 -07:00
JP Abgrall
012c2ea565
dumpstate: collect xtables based iface stats, update iptables info.
...
The newer kernels now have /proc/net/xt_qtaguid/iface_stat_fmt.
Add the extra iptables output and remove ip6tables for nat which doesn't
exist.
Change-Id: I819c707b337a707ca0acd87d9ab38cd68ca0f36c
2012-05-16 20:49:29 -07:00
Mathias Agopian
35fb5e3638
am f17fdcaf
: Merge changes I9f3cbbe0,I12a6f9a9 into jb-dev
...
* commit 'f17fdcaf0a315b02a3992fb4c52d5d4e38f5d291':
Fix "Battery/Status/Clock status bar area flickers when dragging down"
minor refactoring in praparation of crop fix
2012-05-16 19:33:13 -07:00
Mathias Agopian
f17fdcaf0a
Merge changes I9f3cbbe0,I12a6f9a9 into jb-dev
...
* changes:
Fix "Battery/Status/Clock status bar area flickers when dragging down"
minor refactoring in praparation of crop fix
2012-05-16 19:29:29 -07:00
Mathias Agopian
b30c415539
Fix "Battery/Status/Clock status bar area flickers when dragging down"
...
The crop is now handled like a resize, it's latched only when we
receive a new buffer in the case we have a resize in the same
transaction.
Bug: 6498869
Change-Id: I9f3cbbe08fb19443899461ec441c714748a4fd1a
2012-05-16 18:21:32 -07:00
Mathias Agopian
93ffb86b90
minor refactoring in praparation of crop fix
...
Bug: 6498869
Change-Id: I12a6f9a9fdfd2ea1db3fbe5fc8cb443aeaedb328
2012-05-16 17:07:49 -07:00
Siva Velusamy
1644148b00
am f34ec7a4
: Merge "gltrace: Allow receiving commands of length > 4" into jb-dev
...
* commit 'f34ec7a476708b29ab8e3404c0db5f6cfd718379':
gltrace: Allow receiving commands of length > 4
2012-05-16 15:37:12 -07:00
Siva Velusamy
f34ec7a476
Merge "gltrace: Allow receiving commands of length > 4" into jb-dev
2012-05-16 15:33:16 -07:00
Siva Velusamy
2fdcc81ddf
gltrace: Allow receiving commands of length > 4
...
Currently, gltrace offers very few trace collection options. As a
result, these options are encoded in a single integer. The trace
control task simply receives integers and interprets them as
commands.
This patch changes the control protocol to first receive the
command length followed by the actual command itself. This allows
for future flexibility to provide enable other commands.
Change-Id: Id5f56c80a025bbbe7613ab4457e092732e7d9dc9
2012-05-16 12:00:24 -07:00
The Android Open Source Project
dced5dbc6f
am d4272dc6
: Reconcile with jb-release nakasi-factoryrom-release
...
* commit 'd4272dc6c3a5c0541715f6d47227dcaed75868dc':
libgui: improve some logging and dumping
libgui: improve some logging and dumping
Workaround for add_tid_to_cgroup failed to write
make sure to repaint the screen when screen turns on
Add sdcard_r group to dumpstate.
Ensure that /data/anr/traces.txt is world-writable
displayhardware: fix not obeying ro.sf.lcd_density when specified
2012-05-16 08:45:41 -07:00
The Android Open Source Project
d4272dc6c3
Reconcile with jb-release nakasi-factoryrom-release
...
Change-Id: I47aa2582e6f4dc8c82eda09b8c2fbce390ca1222
2012-05-16 08:40:47 -07:00
The Android Automerger
217d352488
merge in nakasi-factoryrom-release history after reset to jb-dev
2012-05-16 07:45:20 -07:00
The Android Automerger
fdfa4ce39e
merge in jb-release history after reset to jb-dev
2012-05-16 07:03:25 -07:00
Eino-Ville Talvala
a07d473c11
am e804aa48
: Merge "Move CameraParameters header to join rest of camera library." into jb-dev
...
* commit 'e804aa4819a764e1f3929f4c578e9a44593a1467':
Move CameraParameters header to join rest of camera library.
2012-05-15 17:29:17 -07:00
Eino-Ville Talvala
e804aa4819
Merge "Move CameraParameters header to join rest of camera library." into jb-dev
2012-05-15 17:21:33 -07:00