Commit Graph

46593 Commits

Author SHA1 Message Date
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
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
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
e804aa4819 Merge "Move CameraParameters header to join rest of camera library." into jb-dev 2012-05-15 17:21:33 -07:00
Eino-Ville Talvala
41caf6dff2 Move CameraParameters header to join rest of camera library.
CameraParameters was moved over to frameworks/native before
frameworks/av was created, since it is referenced by HAL
implementations. Move it to frameworks/av to keep it together with its
implementation.

Bug: 6500863
Change-Id: Iffd890c861a334930da71a2722553572bad1cb54
2012-05-15 15:47:11 -07:00
Jamie Gennis
dd73996552 Merge changes I32fbc2b6,Ifd0ed05b into jb-dev
* changes:
  SurfaceFlinger: recompute visible regions less
  libgui: remove setPostTransformCrop
2012-05-15 11:33:42 -07:00
The Android Automerger
fd037ec1e2 merge in nakasi-factoryrom-release history after reset to jb-dev 2012-05-15 09:34:53 -07:00
The Android Automerger
3deafcd170 merge in jb-release history after reset to jb-dev 2012-05-15 07:04:24 -07:00
Glenn Kasten
bd11322494 Merge "Fix log spam about CPU frequency on one device" into jb-dev 2012-05-14 17:06:48 -07:00
Glenn Kasten
542af12d10 Fix log spam about CPU frequency on one device
Previous kernels have allowed opening the CPU frequency file regardless
whether the CPU is up or not.  This fixes some log spam on one device
with dynamic hot plug CPU feature, which does not allow opening the CPU
frequency file if CPU is down.

Also, since the file descriptors are global and have long lives, add
the close-on-exec flag.

Change-Id: Ia14a2b9e20038dfb96a573920176a47a96bd3f5a
2012-05-14 16:55:26 -07:00
Mathias Agopian
9cab4ca1ca Merge "minor Rect.h cleanup" into jb-dev 2012-05-14 16:09:32 -07:00
Jamie Gennis
cbad735d8c SurfaceFlinger: recompute visible regions less
This change removes some visible region recomputation that was needed to handle
the SCALING_MODE_FREEZE cropping.  We've changed things to use a window crop
from the WindowManager instead, so this is no longer needed.

Bug: 6299171
Change-Id: I32fbc2b689c985837126d8ba3d9a91e79613ffbf
2012-05-14 15:41:38 -07:00
Jamie Gennis
b7a6b96301 libgui: remove setPostTransformCrop
This change removes the setPostTransformCrop function from
SurfaceTextureClient.  It also includes a small logging fix in BufferQueue.

Bug: 6299171
Change-Id: Ifd0ed05b95dad6085e7a8267fda4d69b76ea3bad
2012-05-14 15:41:22 -07:00
JP Abgrall
05f257febc Merge "Ignore SIGPIPE is some of the tools used via bugreport" into jb-dev 2012-05-14 10:49:07 -07:00
The Android Automerger
222f6c29a5 merge in jb-release history after reset to jb-dev 2012-05-14 07:03:41 -07:00
Mathias Agopian
b82203a660 minor Rect.h cleanup
add getBounds(), getWidth(), getHeight(), width() and height()
are kept for backward compatibility.

Change-Id: I83837abf17dc2f8bded1beff73430e8c7d9bbdb3
2012-05-13 20:02:04 -07:00
Jamie Gennis
322495411d libgui: improve some logging and dumping
This change updates some of the SurfaceTextureClient and BufferQueue logging
and dumping to include the crop, transform and scaling mode.  It also removes
the uses of the NO_SCALE_CROP scaling mode enum, which was added by accident in
a previous change.

Change-Id: I62912716a1e48885fb22f12b92678aa13f10fcd9
Bug: 6470541
2012-05-12 14:36:54 -07:00
The Android Automerger
8bed04d82b keep history after reset to JRN40G 2012-05-11 21:26:09 -07:00
Jamie Gennis
dd912baf1c libgui: improve some logging and dumping
This change updates some of the SurfaceTextureClient and BufferQueue logging
and dumping to include the crop, transform and scaling mode.  It also removes
the uses of the NO_SCALE_CROP scaling mode enum, which was added by accident in
a previous change.

Change-Id: I62912716a1e48885fb22f12b92678aa13f10fcd9
Bug: 6470541
2012-05-11 16:28:53 -07:00
JP Abgrall
3e03d3fb6a Ignore SIGPIPE is some of the tools used via bugreport
adb bugreport > b & sleep 5; kill $?
will show that a bunch of tools will SIGPIPE when trying to output data
which is normal.
We don't have a way on linux (bsd yes), to set NOSIGPIPE on the file desc
passed down via fork/exec.

Bug: 6447319
Change-Id: I25b30a823addcff89d252f162d0a07035d4fdd3f
2012-05-11 14:14:09 -07:00
Jamie Gennis
b194ec926b libutils: add a tracing tag for video
Change-Id: Icbecc7184844e95ee81a558b0a54d5513d5cf59f
2012-05-11 04:42:59 -07:00
Jamie Gennis
f15a83f581 SurfaceFlinger: add a crop to the layer state
This change adds a crop rectangle specified in window coordinates to the layer
state.  The all window pixels outside this crop rectangle are treated as though
they were fully transparent.  This change also adds the plumbing necessary for
WindowManager to set that crop.

Change-Id: I582bc445dc8c97d4c943d4db8d582a6ef5a66081
2012-05-11 03:16:02 -07:00
Glenn Kasten
a17aea117e Workaround for add_tid_to_cgroup failed to write
Bug: 6467109
Change-Id: I6dff8e608d83c7a7c453c25c94ad100f113769b9
2012-05-10 18:09:39 -07:00
Glenn Kasten
f30fd01497 Merge "Workaround for add_tid_to_cgroup failed to write" into jb-dev 2012-05-10 17:38:34 -07:00
Glenn Kasten
10cbbd8f1f Workaround for add_tid_to_cgroup failed to write
Bug: 6467109
Change-Id: I6dff8e608d83c7a7c453c25c94ad100f113769b9
2012-05-10 15:52:59 -07:00
Jamie Gennis
51dcd581b1 SurfaceFlinger: recompute visible regions more
This change makes a change in the crop, scaling mode, transform, or buffer
dimensions trigger a recomputation of the visible regions of a window.  With
the new cropping behavior for SCALING_MODE_FREEZE all of these can now affect
the visible region.

Bug: 6470541
Change-Id: I1904e47efbd708e28bf189f637d24dbef65cd41e
2012-05-10 15:35:56 -07:00
Jamie Gennis
cd1806e210 libgui: improve some logging and dumping
This change updates some of the SurfaceTextureClient and BufferQueue logging
and dumping to include the crop, transform and scaling mode.  It also removes
the uses of the NO_SCALE_CROP scaling mode enum, which was added by accident in
a previous change.

Change-Id: I62912716a1e48885fb22f12b92678aa13f10fcd9
Bug: 6470541
2012-05-10 15:35:22 -07:00
Jean-Michel Trivi
3c32e5da5b Merge "OMX IL header additions for FLAC" into jb-dev 2012-05-10 09:53:44 -07:00
The Android Automerger
79dc7587bf merge in jb-release history after reset to jb-dev 2012-05-10 07:03:31 -07:00
Jean-Michel Trivi
224c78405f OMX IL header additions for FLAC
Bug 5525503

Change-Id: I8d305d5351d3780f8ca933b8e602f2bf88e9ac78
2012-05-09 16:35:50 -07:00
Dianne Hackborn
555f89d8df Add callback hack to find out when to reload system properties.
Every IBinder object can accept a new transaction to tell it that
it might want to reload system properties, and in the process
anyone can register a callback to be executed when this happens.

Use this to reload the trace property.

This is very much ONLY for debugging.

Change-Id: I55c67c46f8f3fa9073bef0dfaab4577ed1d47eb4
2012-05-09 14:53:26 -07:00
Jamie Gennis
161534a3c5 SurfaceFlinger: SCALING_MODE_FREEZE cropping support
This change adss support for applying a buffer crop to layers with the
SCALING_MODE_FREEZE scaling mode.  These layers do not scale the image, but
rather treat all pixels outside the crop rectangle as fully transparent.

Change-Id: I762518e56a37aef7747f9b581df2f2589b232c49
Bug: 6299171
2012-05-09 12:53:13 -07:00
Jamie Gennis
cbb1a95819 SurfaceFlinger: tell SurfaceTex about filtering
This change makes SurfaceFlinger set the filtering-enable on each layer's
SurfaceTexture before querying the texture matrix to use for GLES composition.

Change-Id: I40c3defd73ebf96e3cabb3bfdb1fc97f2036753a
2012-05-09 12:53:13 -07:00
Jamie Gennis
82c53806ad Merge "SurfaceTexture: improve texture matrix computation" into jb-dev 2012-05-09 12:52:25 -07:00