The Android Automerger
c27daec5c4
merge in jb-release history after reset to master
2012-04-18 07:03:28 -07:00
Mathias Agopian
b9494d5c9d
make sure to clear the framebuffer when using overlays
...
Bug: 6354761, 6353719
Change-Id: I0739de3fee7c54c14b294ffd768b70ee1f541d9e
2012-04-18 02:28:45 -07:00
Jeff Brown
992b4c556b
Merge "Support tokenizing arbitrary content."
2012-04-17 18:20:55 -07:00
Jeff Brown
a8be8fa096
Support tokenizing arbitrary content.
...
Bug: 6110399
Change-Id: I37be63b68934fd451e6dffbf7d6079553619c0a3
2012-04-17 18:19:50 -07:00
Jamie Gennis
9aa74dbc70
SurfaceTexture: fix a memory leak
...
This change fixes an issue where we were sometimes setting the SurfaceTexture's
EGLDisplay to EGL_NO_DISPLAY in detachFromContext, and then subsequently
abandoning the texture. Abandoning while in the detached state would result in
the eglDestroyImageKHR calls failing, which resulted in a memory leak.
Bug: 6302694
Change-Id: I24c1de0dac029a83c7508075fb8aaeaed96a14ea
2012-04-17 15:53:31 -07:00
Jamie Gennis
2efa4b2bb0
Merge changes Id79430f9,I541d3046
...
* changes:
BufferQueue: check before tracing buffer index
SurfaceTexture: shrink all sides when cropping
2012-04-17 15:52:49 -07:00
Mathias Agopian
fe668f4682
Merge "double checked locking pattern is not safe on SMP"
2012-04-17 14:22:45 -07:00
Chris Craik
4851e21d2a
Merge "Add webview tracing bit"
2012-04-17 10:04:42 -07:00
The Android Automerger
a4ed4ff16f
merge in jb-release history after reset to master
2012-04-17 07:02:56 -07:00
Jamie Gennis
695e331f01
BufferQueue: check before tracing buffer index
...
This change adds a check on ATRACE_ENABLED before calling snprintf to trace the
buffer index.
Change-Id: Id79430f9c69706393efd3d10780a4cc97055e9e0
2012-04-16 20:36:25 -07:00
Jamie Gennis
91a6826d67
SurfaceTexture: shrink all sides when cropping
...
This change makes SurfaceTexture include an offset for all sides of the crop
region when cropping. This keeps the image centered, to minimize the visual
changes when switching between the texture transform matrix-based cropping and
something that does proper cropping (e.g. HWComposer).
Change-Id: I541d3046fd92e49221b488444df36d490924d1c5
2012-04-16 20:33:54 -07:00
Mathias Agopian
e8db871de7
double checked locking pattern is not safe on SMP
...
Change-Id: Ie6dd564bdcd45647cb4d62ab259462e3db112576
2012-04-16 19:30:56 -07:00
Mathias Agopian
3aecbb0715
fix Region const_iterator.
...
- it returned an empty rect when the region was empty, instead
of returning an empty list of rect.
- also fixed an infinite loop when boolean_operation was given
an empty list of rects
Change-Id: I62225c7dcd2832025bb8f12e6cb3762f2a7b36cb
2012-04-16 18:40:30 -07:00
Chris Craik
6acafadea0
Add webview tracing bit
...
Change-Id: I82e54f5eeb2666a255e372fd3bfcc54c1b3d76a0
2012-04-16 16:09:16 -07:00
Mathias Agopian
0c8ecacb37
Merge "don't attempt to clip layers anymore using glScissor"
2012-04-16 16:00:11 -07:00
Mathias Agopian
160d544dbb
Merge "get rid off preserve backbuffer optimization in SF"
2012-04-16 15:59:59 -07:00
Mathias Agopian
82ca93bf66
Merge "s/w rendered apps can now use n-buffering (n>2)"
2012-04-16 15:59:39 -07:00
The Android Automerger
d757d0b346
merge in jb-release history after reset to master
2012-04-16 07:03:41 -07:00
Mathias Agopian
f74e8e0602
don't attempt to clip layers anymore using glScissor
...
this seems to hurt performance on some GPU. this change
might negatively affect performance on other GPUs though, but
probably in less time-sensitive cases. If this becomes a
problem it might become necessary to pre-clip the geometry
(so that we don't have to use glScissor).
This improves the rotation animation quite a bit.
Change-Id: I5dbe1286f7ad858ef2c1e1ad9a07ee3f26c0b1f3
2012-04-16 03:19:15 -07:00
Mathias Agopian
a2f4e56fec
get rid off preserve backbuffer optimization in SF
...
this optimization didn't improve performance and in fact
seemed to hurt more than anything else. it also made
things a lot more complex as it introduced edges cases
when switching to/from h/w composer.
Change-Id: Iaafc235e175f5740cd98bff914d706e02ab88bb8
2012-04-16 03:19:15 -07:00
Mathias Agopian
172a62a224
make sure to pass the transform-hint on ANW.connect
...
this optimization was probably lost during ST refactoring.
Change-Id: I845978c4b718cb91941d15b30484837f19714abe
2012-04-16 00:08:26 -07:00
Mathias Agopian
5f08788350
make sure to repaint the screen when screen turns on
...
Bug: 6336168
Change-Id: Ic6f11b6bf6c3d849f5cb6ac95961d10d7f88e4ec
2012-04-13 16:31:51 -07:00
Mathias Agopian
568569aaa0
Merge "make sure to repaint the screen when screen turns on"
2012-04-13 16:21:06 -07:00
Mathias Agopian
8acce2046a
make sure to repaint the screen when screen turns on
...
Bug: 6336168
Change-Id: Ic6f11b6bf6c3d849f5cb6ac95961d10d7f88e4ec
2012-04-13 16:18:55 -07:00
Mathias Agopian
ac6035a12a
s/w rendered apps can now use n-buffering (n>2)
...
Bug: 6311881
Change-Id: I6e52e281e8d432430aad011f6d9dcf35d7b4ac7d
2012-04-13 16:04:44 -07:00
Martijn Coenen
8ed0486bd2
Move com.nxp.mifare to frameworks/native.
...
Change-Id: I4dbec41cbf062334af8d66780859736f0ee5dab3
2012-04-12 21:24:08 -07:00
Mathias Agopian
fca660cf73
don't wake-up eventthread every 16ms if there are no vsync requests
...
Bug: 6332534
Change-Id: Idf79ad913770c6180969f6c95a9b125fff580231
2012-04-12 20:43:16 -07:00
Mathias Agopian
b364be8e55
fix a typo causing pre-rotation to never work
...
Change-Id: I8d698ec52d53ef1a553b887c7329413e1f49cc72
2012-04-12 19:40:28 -07:00
Daniel Lam
016c8cbce4
Enabled cropping support in SurfaceTexture
...
SurfaceTexture will modify the crop rect so it matches
the desired output aspect ratio when the scaling
mode is NATIVE_WINDOW_SCALING_MODE_CROP. Added a test
for this new scaling mode.
Change-Id: I60f24dcbc294b65cd10a393d9e27d40f07d27bb6
2012-04-12 17:49:03 -07:00
Ramanan Rajeswaran
3bc59682cd
add com.android.nfc_extras to native/ for pdk.
...
Change-Id: Ife40ac33241878814f5d9e027e43cd176c57fb56
2012-04-12 13:11:23 -07:00
The Android Automerger
33250339ad
merge in jb-release history after reset to master
2012-04-12 07:03:07 -07:00
Mathias Agopian
948f390bfd
Merge "Revert "handle surfaces posts independently from composition""
2012-04-11 20:45:32 -07:00
Mathias Agopian
69a655caef
Revert "handle surfaces posts independently from composition"
...
This reverts commit 562f4b2c1e
.
Change-Id: I96efe11c2f0494ed2d57fc580e49c598d913830e
2012-04-11 20:43:40 -07:00
Jamie Gennis
a96b6bdea3
SurfaceTexture: work around a compiler bug
...
This change works around a compiler bug with the GCC 4.6 toolchain.
Bug: 6292211
Change-Id: I004c4750d92a29f193a37d8e605a28fdc3b7f076
2012-04-11 18:37:54 -07:00
Jamie Gennis
c2c380259b
SurfaceTexture: add a test for user sizes & prerotation
...
This change adds 3 tests for:
- User-overridden buffer size
- Transform hint
- User-overridden buffer size with transform hint
Change-Id: Ib15ea354685e436822c506099613b2bffa7b68c9
2012-04-11 18:37:54 -07:00
Michael I. Gold
55a701459d
SurfaceTextureClient: support for application buffer dimensions
...
Add a new API native_window_set_buffers_user_dimensions to allow native
applications to override the native window size for the default buffer size.
This has lower precedence than the existing
native_window_set_buffers_dimensions and allows the two to co-exist.
Change-Id: Ie73590e1c94ef0dadbce500bd0941dfabbcace3c
2012-04-11 18:37:54 -07:00
Mathias Agopian
562f4b2c1e
handle surfaces posts independently from composition
...
surfaceflinger will now handle each surface post
as soon as possible and handle the composition
itself at VSYNC time as usual.
Change-Id: I6b1ae33fd56062d86e5419ebab8def0ca5803fbf
2012-04-11 18:17:30 -07:00
Mathias Agopian
ea0c6c9396
Merge "make sure to disable VSYNC while screen is off"
2012-04-11 18:13:55 -07:00
Jeff Sharkey
9d188b0bc2
Add sdcard_r group to dumpstate.
...
Bug: 6321962
Change-Id: I318cd88493396f3d8adb5d4d0fc7a12ee40ba737
2012-04-11 17:23:55 -07:00
Mathias Agopian
ceb8c19325
Merge "rework screen on/off code"
2012-04-11 15:35:21 -07:00
Mathias Agopian
22ffb117b0
make sure to disable VSYNC while screen is off
...
Change-Id: If1894c43b0a39a2851e1280a35ae77bccd6d9abd
2012-04-11 15:31:40 -07:00
Jeff Sharkey
f573e9f5ca
Merge "Add sdcard_r group to dumpstate."
2012-04-11 12:31:43 -07:00
Jeff Sharkey
4287cb4595
Add sdcard_r group to dumpstate.
...
Bug: 6321962
Change-Id: I318cd88493396f3d8adb5d4d0fc7a12ee40ba737
2012-04-11 12:27:48 -07:00
The Android Automerger
5b2d2ea943
merge in jb-release history after reset to master
2012-04-11 07:04:39 -07:00
Mathias Agopian
b60314a12f
rework screen on/off code
...
Change-Id: I13f71e850592a588bbd4805b1830c503bd4decb4
2012-04-10 22:18:43 -07:00
Mathias Agopian
e2c4f4ec23
Added vsync debugging information in dumpsys log
...
Change-Id: I20ef05a73d89caaf6a70dc9ca25ada6e6a1f6ff9
2012-04-10 21:04:12 -07:00
Mathias Agopian
f0bc2f1d8d
use in/out structures for queueBuffer() IPC
...
Change-Id: Ie125df2444b62a9a2200586a717dca268852afc9
2012-04-10 21:04:12 -07:00
Mathias Agopian
cac72cdbdf
Merge "BufferQueue returns proper code on acquire"
2012-04-10 18:53:50 -07:00
The Android Automerger
305c7955a1
merge in jb-release history after reset to master
2012-04-10 07:04:13 -07:00
Daniel Lam
fbcda930dd
BufferQueue returns proper code on acquire
...
Also removed unnecessary debug messages from
SurfaceTextureClient.
Change-Id: I291897a44170142f9d42a007b008823fad4683e0
2012-04-09 23:21:33 -07:00