OSDN Git Service
Dianne Hackborn [Wed, 6 Jun 2012 17:54:28 +0000 (10:54 -0700)]
am
a586c9b1: am
be502a02: Add new Dalvik memory limit definition.
* commit '
a586c9b18ad780e32b3c6f8a99d1e9432cc52639':
Add new Dalvik memory limit definition.
Dianne Hackborn [Wed, 6 Jun 2012 17:51:15 +0000 (10:51 -0700)]
am
be502a02: Add new Dalvik memory limit definition.
* commit '
be502a02c8e0ea232e7339ed60b1754c929ecec1':
Add new Dalvik memory limit definition.
Dianne Hackborn [Wed, 6 Jun 2012 01:21:03 +0000 (18:21 -0700)]
Add new Dalvik memory limit definition.
This is for a 7in hdpi/tvdpi tablet with 1G of RAM.
That sounds kind-of familiar. I don't know. Have I seen
such a thing before? Maybe.
Bug:
6576049
Change-Id: Iabc245692d5106feec9199eb2b5a3d06e27a9b83
Mathias Agopian [Tue, 5 Jun 2012 16:21:56 +0000 (09:21 -0700)]
am
4929e821: am
4824d40a: sometimes SF would not process a surface resize
* commit '
4929e821ffad4e53192ad6d2aa65a6f040c295b8':
sometimes SF would not process a surface resize
Mathias Agopian [Tue, 5 Jun 2012 01:35:48 +0000 (18:35 -0700)]
am
4824d40a: sometimes SF would not process a surface resize
* commit '
4824d40a35333182c2eb3593511b9bcbecd0a943':
sometimes SF would not process a surface resize
Mathias Agopian [Tue, 5 Jun 2012 01:16:30 +0000 (18:16 -0700)]
sometimes SF would not process a surface resize
this would happen when a window started with size A, was
resized to B and immediately resized to A. In this situation
the erquested and active size would be the same, and SF
would think a transaction wasn't needed.
we fix this by always comparing the requested sizes.
Also, make sure to set mRefreshPending once we're sure
we have succesfully called updateTexImage().
Bug:
6580962
Change-Id: I2c48b4df7f05fd35c9e1d2dd82095b0f3d5a0b6a
Jeff Brown [Fri, 1 Jun 2012 01:43:27 +0000 (18:43 -0700)]
am
d5085da3: am
4467bba7: Merge "Support looper callbacks based on smart pointers." into jb-dev
* commit '
d5085da3c0c103bba0c2c927382f7d414275b661':
Support looper callbacks based on smart pointers.
Jeff Brown [Fri, 1 Jun 2012 01:43:26 +0000 (18:43 -0700)]
am
80586761: am
dad23789: Merge "Delete unused poll() code." into jb-dev
* commit '
805867612c0c11d3bb494cbf454cbb2de21a1b75':
Delete unused poll() code.
Jeff Brown [Fri, 1 Jun 2012 01:43:26 +0000 (18:43 -0700)]
am
dce1547d: am
9e2e781a: Merge "Remove unused statistics code." into jb-dev
* commit '
dce1547d65877b89cec4e52ee8e5b39830911d00':
Remove unused statistics code.
Jeff Brown [Fri, 1 Jun 2012 01:41:16 +0000 (18:41 -0700)]
am
4467bba7: Merge "Support looper callbacks based on smart pointers." into jb-dev
* commit '
4467bba73a91161da01d5d969cf7ba3e2309d989':
Support looper callbacks based on smart pointers.
Jeff Brown [Fri, 1 Jun 2012 01:41:16 +0000 (18:41 -0700)]
am
dad23789: Merge "Delete unused poll() code." into jb-dev
* commit '
dad2378911a244607afa3899928c429b340031cb':
Delete unused poll() code.
Jeff Brown [Fri, 1 Jun 2012 01:41:14 +0000 (18:41 -0700)]
am
9e2e781a: Merge "Remove unused statistics code." into jb-dev
* commit '
9e2e781acaead54d0fb095d55a1c44b32563248f':
Remove unused statistics code.
Jeff Brown [Fri, 1 Jun 2012 01:39:13 +0000 (18:39 -0700)]
Merge "Support looper callbacks based on smart pointers." into jb-dev
Jeff Brown [Fri, 1 Jun 2012 01:39:06 +0000 (18:39 -0700)]
Merge "Delete unused poll() code." into jb-dev
Jeff Brown [Fri, 1 Jun 2012 01:39:02 +0000 (18:39 -0700)]
Merge "Remove unused statistics code." into jb-dev
Jeff Brown [Thu, 31 May 2012 23:15:35 +0000 (16:15 -0700)]
Support looper callbacks based on smart pointers.
Bug:
6559630
Change-Id: I5a667f219f431838638acefbc9fa6afa610971bd
Eino-Ville Talvala [Thu, 31 May 2012 22:49:43 +0000 (15:49 -0700)]
Add camera as an ATRACE tag
Change-Id: Ib4f22d593836c4b973d122efa114d359f1529914
Jeff Brown [Thu, 31 May 2012 02:21:12 +0000 (19:21 -0700)]
Delete unused poll() code.
We don't need this code anymore and it is just in the way.
Bug:
6559630
Change-Id: I1dc9decf85d5ea1feab159c2985da6c20baffdd5
Jeff Brown [Thu, 31 May 2012 02:17:47 +0000 (19:17 -0700)]
Remove unused statistics code.
Bug:
6559630
Change-Id: Iacdf4bb4c1c125c09305cbd8cb443c7c80cfc010
Jamie Gennis [Wed, 30 May 2012 02:14:36 +0000 (19:14 -0700)]
Add the EGL_ANDROID_fence_sync spec.
Change-Id: I8c26e5caaf8d89a60a09a5308d55e336537b916e
The Android Open Source Project [Wed, 30 May 2012 17:21:50 +0000 (10:21 -0700)]
The Android Open Source Project [Wed, 30 May 2012 17:15:16 +0000 (10:15 -0700)]
Reconcile with jb-release
Change-Id: If0a430615dadb425b82aa27204e6c670f06ee099
The Android Automerger [Wed, 30 May 2012 14:03:19 +0000 (07:03 -0700)]
merge in jb-release history after reset to jb-dev
Mathias Agopian [Wed, 30 May 2012 04:09:04 +0000 (21:09 -0700)]
am
79f2e1af: am
e31564d8: Fix a crasher is surfaceflinger.
* commit '
79f2e1afbc08cd0cbcddc70cde5e3b7f1f0afea4':
Fix a crasher is surfaceflinger.
Mathias Agopian [Wed, 30 May 2012 04:06:55 +0000 (21:06 -0700)]
am
e31564d8: Fix a crasher is surfaceflinger.
* commit '
e31564d8eb0ab67e167a888eccce20f5b4e4ef45':
Fix a crasher is surfaceflinger.
Mathias Agopian [Wed, 30 May 2012 03:41:03 +0000 (20:41 -0700)]
Fix a crasher is surfaceflinger.
this bug introduced recently would happen when the very first
buffer of a surface was rejected for not having the right size
Bug:
6577035
Change-Id: I9fabf20006019f2a6c308be7c7f5c05bdcfd5014
Mathias Agopian [Wed, 30 May 2012 02:53:52 +0000 (19:53 -0700)]
am
584fcb32: am
2c8207e9: add the ability to reject buffers in SurfaceTexture::updateTexImage
* commit '
584fcb3218e07d7b4cc0aeaef41faa4e891b45a4':
add the ability to reject buffers in SurfaceTexture::updateTexImage
Mathias Agopian [Wed, 30 May 2012 02:53:50 +0000 (19:53 -0700)]
am
c7c8334f: am
702634a4: refactoring in preparation for bug:
6498869 fix
* commit '
c7c8334f059e42106c7cfa27cdead277fd5e135d':
refactoring in preparation for bug:
6498869 fix
Mathias Agopian [Wed, 30 May 2012 02:53:49 +0000 (19:53 -0700)]
am
f67148ec: am
05cec9d1: improve resize transactions
* commit '
f67148eccd54a9529e9e65c0f1bc07f1abd01fb6':
improve resize transactions
Mathias Agopian [Wed, 30 May 2012 02:53:47 +0000 (19:53 -0700)]
am
b18d747e: am
419e196e: Improve debug logs and minor clean-up
* commit '
b18d747ef6ddf5d140221e32a287a5238f729612':
Improve debug logs and minor clean-up
Mathias Agopian [Wed, 30 May 2012 02:50:58 +0000 (19:50 -0700)]
am
2c8207e9: add the ability to reject buffers in SurfaceTexture::updateTexImage
* commit '
2c8207e9627fe6c7a90e31fae8d71ae49df56845':
add the ability to reject buffers in SurfaceTexture::updateTexImage
Mathias Agopian [Wed, 30 May 2012 02:50:57 +0000 (19:50 -0700)]
am
702634a4: refactoring in preparation for bug:
6498869 fix
* commit '
702634a4dad85cfc292618ac91eda6c00f42b7c5':
refactoring in preparation for bug:
6498869 fix
Mathias Agopian [Wed, 30 May 2012 02:50:55 +0000 (19:50 -0700)]
am
05cec9d1: improve resize transactions
* commit '
05cec9d1275fd939c2d1aec235dca2bdb8edef63':
improve resize transactions
Mathias Agopian [Wed, 30 May 2012 02:50:54 +0000 (19:50 -0700)]
am
419e196e: Improve debug logs and minor clean-up
* commit '
419e196e639c8adb875da2765abcef95017b6d4a':
Improve debug logs and minor clean-up
The Android Open Source Project [Tue, 29 May 2012 16:44:58 +0000 (09:44 -0700)]
am
65838c52: Reconcile with nakasi-factoryrom-release
* commit '
65838c52fa47cd4b7adf2ca0c27ed26376acc6c5':
The Android Open Source Project [Tue, 29 May 2012 16:41:02 +0000 (09:41 -0700)]
Reconcile with nakasi-factoryrom-release
Change-Id: Ib47a2f4001bbf5ec4a2b889a16e41a1259eb6e1a
The Android Automerger [Thu, 24 May 2012 17:17:56 +0000 (10:17 -0700)]
merge in nakasi-factoryrom-release history after reset to jb-dev
The Android Open Source Project [Thu, 24 May 2012 16:04:10 +0000 (09:04 -0700)]
am
227d45ea: Reconcile with jb-release nakasi-factoryrom-release
* commit '
227d45ea2b9ccade09fd620d028e992ff1140b99':
The Android Open Source Project [Thu, 24 May 2012 16:01:16 +0000 (09:01 -0700)]
Reconcile with jb-release nakasi-factoryrom-release
Change-Id: I3bc06420f32fe0ce50b6943fe33eca293f375d05
Mathias Agopian [Thu, 24 May 2012 00:56:42 +0000 (17:56 -0700)]
add the ability to reject buffers in SurfaceTexture::updateTexImage
SurfaceFlinger is using this new feature to reject buffers that
don't have the right size.
Bug:
6498869
Change-Id: I8a7250a47db6c082a357b703feb3b9d0fc8d3443
Mathias Agopian [Thu, 24 May 2012 00:50:31 +0000 (17:50 -0700)]
refactoring in preparation for bug:
6498869 fix
here we just shuffle a bit the code inside lockPageFlip(),
we move the code that handles the buffer size closer to the call
to updateTexImage(). no functionality change.
Change-Id: Ie3193cd86cd32cf3c89532449fd747d145ca0ab6
Mathias Agopian [Wed, 23 May 2012 21:35:49 +0000 (14:35 -0700)]
improve resize transactions
use a flag instead of pre-committing the "requested" state
to prevent propagation or "requested" to "active", which makes
things a lot clearer when reading the code.
also avoid going through the "resized" code-path when requested
size is equal to "active" size.
Bug:
6498869
Change-Id: I24f893ba0ec5ca06aac5b8da9818989ae7ce4005
Mathias Agopian [Wed, 23 May 2012 21:34:07 +0000 (14:34 -0700)]
Improve debug logs and minor clean-up
Bug:
6498869
Change-Id: I14d1b4d6960b87b5a7c4d7e20b92538edd9331ff
The Android Automerger [Wed, 23 May 2012 14:02:43 +0000 (07:02 -0700)]
merge in jb-release history after reset to jb-dev
Jesse Hall [Wed, 23 May 2012 04:29:27 +0000 (21:29 -0700)]
am
138a8d75: am
e1082496: Enable SurfaceTexture fence sync for the emulator
* commit '
138a8d7510e6ba8a402ffacc38c7cc5bfaa5e571':
Enable SurfaceTexture fence sync for the emulator
Jesse Hall [Wed, 23 May 2012 04:27:13 +0000 (21:27 -0700)]
am
e1082496: Enable SurfaceTexture fence sync for the emulator
* commit '
e10824965c64663b8878b808206ee382c7ab6af8':
Enable SurfaceTexture fence sync for the emulator
Todd Poynor [Wed, 23 May 2012 00:54:59 +0000 (17:54 -0700)]
dumpstate: Add kernel wakeup sources info
Change-Id: I0f95afd6815c1403d8400a18ef3cd19d936d4601
Jesse Hall [Mon, 21 May 2012 18:23:28 +0000 (11:23 -0700)]
Enable SurfaceTexture fence sync for the emulator
The host-accelerated GL ES driver doesn't do the implicit
synchronization required when fence sync isn't used.
Bug:
6515813
Change-Id: I6a667f2db6b519f3557b5abda78775f767841dae
Jesse Hall [Tue, 22 May 2012 23:09:27 +0000 (16:09 -0700)]
am
1974391b: am
83e7c8c4: Implement the EGL_KHR_fence_sync in libagl
* commit '
1974391ba8d47a6f9468e2e72bd688dc48d3b827':
Implement the EGL_KHR_fence_sync in libagl
Jesse Hall [Tue, 22 May 2012 23:07:25 +0000 (16:07 -0700)]
am
83e7c8c4: Implement the EGL_KHR_fence_sync in libagl
* commit '
83e7c8c431ec8b578b6f778811837632e3798768':
Implement the EGL_KHR_fence_sync in libagl
The Android Open Source Project [Tue, 22 May 2012 21:21:17 +0000 (14:21 -0700)]
The Android Automerger [Tue, 22 May 2012 20:24:05 +0000 (13:24 -0700)]
merge in nakasi-factoryrom-release history after reset to jb-dev
The Android Open Source Project [Tue, 22 May 2012 20:06:34 +0000 (13:06 -0700)]
Reconcile with jb-release
Change-Id: I37477f9871208d227b42937c5aa7d27129bdecb1
Jesse Hall [Tue, 22 May 2012 17:42:56 +0000 (10:42 -0700)]
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
The Android Automerger [Tue, 22 May 2012 14:05:42 +0000 (07:05 -0700)]
merge in jb-release history after reset to jb-dev
Mathias Agopian [Mon, 21 May 2012 21:32:58 +0000 (14:32 -0700)]
am
4ae4e6f2: am
cc2b1560: fix EGL_CLIENT_STRING
* commit '
4ae4e6f2da480b31b5e545e9179cb6881893d7b9':
fix EGL_CLIENT_STRING
The Android Open Source Project [Mon, 21 May 2012 21:28:46 +0000 (14:28 -0700)]
am
3d8added: Reconcile with jb-release nakasi-factoryrom-release
* commit '
3d8addedff14f2b85f89eb1a2ea24edb249a470b':
Mathias Agopian [Mon, 21 May 2012 21:27:29 +0000 (14:27 -0700)]
am
83f1d839: am
7e477bfe: make sure BufferQueue releases newly acquired buffers on failures
* commit '
83f1d83975345bada9886e9ea0ef2b950d90cd77':
make sure BufferQueue releases newly acquired buffers on failures
Mathias Agopian [Mon, 21 May 2012 21:15:00 +0000 (14:15 -0700)]
am
cc2b1560: fix EGL_CLIENT_STRING
* commit '
cc2b1560e87369676a2d13f17bd1ff4021a91819':
fix EGL_CLIENT_STRING
Mathias Agopian [Mon, 21 May 2012 21:11:46 +0000 (14:11 -0700)]
am
ac4a4825: am
f899e411: Remove misleading and wrong ALOGW
* commit '
ac4a48251180a79ae19e3a7112537c3d0fa260c6':
Remove misleading and wrong ALOGW
Mathias Agopian [Mon, 21 May 2012 21:11:41 +0000 (14:11 -0700)]
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
Mathias Agopian [Mon, 21 May 2012 21:01:37 +0000 (14:01 -0700)]
fix EGL_CLIENT_STRING
it should read OpenGL_ES (with an underscore)
Bug:
6529643
Change-Id: I7caf07793bffe5a8dcceaff496a222077486fc87
Jeff Sharkey [Mon, 21 May 2012 19:45:09 +0000 (12:45 -0700)]
am
82e7812a: am
a66faaa6: Merge "Dump packages.xml as root." into jb-dev
* commit '
82e7812ab1e09170106a836c143365b3662ff823':
Dump packages.xml as root.
Mathias Agopian [Mon, 21 May 2012 19:43:25 +0000 (12:43 -0700)]
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
Jesse Hall [Mon, 21 May 2012 19:41:02 +0000 (12:41 -0700)]
am
bd56aabb: am
515f19da: Merge "Recreate EGLImage for previously used slots" into jb-dev
* commit '
bd56aabb92097546073c8dd8949bb03161e72c56':
Recreate EGLImage for previously used slots
JP Abgrall [Mon, 21 May 2012 19:40:35 +0000 (12:40 -0700)]
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.
The Android Automerger [Sun, 20 May 2012 14:39:46 +0000 (07:39 -0700)]
merge in jb-release history after reset to jb-dev
The Android Open Source Project [Sat, 19 May 2012 01:43:36 +0000 (18:43 -0700)]
Reconcile with jb-release nakasi-factoryrom-release
Change-Id: I42366ee22738eac90627669da9bb03ec8b598724
Mathias Agopian [Sat, 19 May 2012 00:11:23 +0000 (17:11 -0700)]
am
7e477bfe: make sure BufferQueue releases newly acquired buffers on failures
* commit '
7e477bfe11f8bb31622353b64e85721df3cf9702':
make sure BufferQueue releases newly acquired buffers on failures
Mathias Agopian [Fri, 18 May 2012 23:50:58 +0000 (16:50 -0700)]
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
Mathias Agopian [Fri, 18 May 2012 22:59:24 +0000 (15:59 -0700)]
am
f899e411: Remove misleading and wrong ALOGW
* commit '
f899e4113a5b5545cd91b4625514d0ab0d33751c':
Remove misleading and wrong ALOGW
Mathias Agopian [Fri, 18 May 2012 22:59:23 +0000 (15:59 -0700)]
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
Mathias Agopian [Fri, 18 May 2012 22:32:28 +0000 (15:32 -0700)]
Remove misleading and wrong ALOGW
Bug:
6476587
Change-Id: I4345f1100db02786bb50ad83ca7b559cad301706
Mathias Agopian [Fri, 18 May 2012 21:18:08 +0000 (14:18 -0700)]
we need to wait for vsync when doing the screen-off animation
Bug:
6511421
Change-Id: I7a85a55e66a3a8d9937df575e98a5efec01a634f
Jeff Sharkey [Fri, 18 May 2012 21:21:40 +0000 (14:21 -0700)]
am
a66faaa6: Merge "Dump packages.xml as root." into jb-dev
* commit '
a66faaa65a235e24e78f75c79cc3bd209b67e1f8':
Dump packages.xml as root.
Jeff Sharkey [Fri, 18 May 2012 18:40:49 +0000 (11:40 -0700)]
Merge "Dump packages.xml as root." into jb-dev
The Android Automerger [Fri, 18 May 2012 17:47:59 +0000 (10:47 -0700)]
merge in nakasi-factoryrom-release history after reset to jb-dev
Mathias Agopian [Fri, 18 May 2012 03:56:48 +0000 (20:56 -0700)]
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
Mathias Agopian [Fri, 18 May 2012 00:49:46 +0000 (17:49 -0700)]
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
Mathias Agopian [Fri, 18 May 2012 00:48:09 +0000 (17:48 -0700)]
Merge "fix a corruption in Vector<> when adding new items" into jb-dev
Mathias Agopian [Thu, 17 May 2012 23:52:21 +0000 (16:52 -0700)]
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
Siva Velusamy [Thu, 17 May 2012 22:33:27 +0000 (15:33 -0700)]
am
1644148b: am
f34ec7a4: Merge "gltrace: Allow receiving commands of length > 4" into jb-dev
* commit '
1644148b002825905c7db11ee53f7af0d83f6144':
gltrace: Allow receiving commands of length > 4
Jeff Sharkey [Thu, 17 May 2012 19:40:11 +0000 (12:40 -0700)]
Dump packages.xml as root.
Bug:
6501151
Change-Id: Ied638bdbe9ed6fbf749a44de8ac1f9d4167829c1
Jesse Hall [Thu, 17 May 2012 19:09:50 +0000 (12:09 -0700)]
am
515f19da: Merge "Recreate EGLImage for previously used slots" into jb-dev
* commit '
515f19da246a11c417c1771d4293e753f09e79b6':
Recreate EGLImage for previously used slots
Jesse Hall [Thu, 17 May 2012 19:07:39 +0000 (12:07 -0700)]
Merge "Recreate EGLImage for previously used slots" into jb-dev
Jesse Hall [Thu, 17 May 2012 06:44:34 +0000 (23:44 -0700)]
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
JP Abgrall [Thu, 17 May 2012 18:06:01 +0000 (11:06 -0700)]
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.
JP Abgrall [Thu, 17 May 2012 18:04:07 +0000 (11:04 -0700)]
Merge "dumpstate: collect xtables based iface stats, update iptables info." into jb-dev
The Android Automerger [Thu, 17 May 2012 14:03:31 +0000 (07:03 -0700)]
merge in jb-release history after reset to jb-dev
JP Abgrall [Thu, 17 May 2012 03:49:29 +0000 (20:49 -0700)]
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
Mathias Agopian [Thu, 17 May 2012 02:33:13 +0000 (19:33 -0700)]
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
Mathias Agopian [Thu, 17 May 2012 02:29:29 +0000 (19:29 -0700)]
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
Mathias Agopian [Thu, 17 May 2012 01:21:32 +0000 (18:21 -0700)]
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
Mathias Agopian [Thu, 17 May 2012 00:07:49 +0000 (17:07 -0700)]
minor refactoring in praparation of crop fix
Bug:
6498869
Change-Id: I12a6f9a9fdfd2ea1db3fbe5fc8cb443aeaedb328
Siva Velusamy [Wed, 16 May 2012 22:37:12 +0000 (15:37 -0700)]
am
f34ec7a4: Merge "gltrace: Allow receiving commands of length > 4" into jb-dev
* commit '
f34ec7a476708b29ab8e3404c0db5f6cfd718379':
gltrace: Allow receiving commands of length > 4
Siva Velusamy [Wed, 16 May 2012 22:33:16 +0000 (15:33 -0700)]
Merge "gltrace: Allow receiving commands of length > 4" into jb-dev
Siva Velusamy [Wed, 16 May 2012 18:38:03 +0000 (11:38 -0700)]
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
The Android Open Source Project [Wed, 16 May 2012 15:45:41 +0000 (08:45 -0700)]
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
The Android Open Source Project [Wed, 16 May 2012 15:40:47 +0000 (08:40 -0700)]
Reconcile with jb-release nakasi-factoryrom-release
Change-Id: I47aa2582e6f4dc8c82eda09b8c2fbce390ca1222
The Android Automerger [Wed, 16 May 2012 14:45:20 +0000 (07:45 -0700)]
merge in nakasi-factoryrom-release history after reset to jb-dev