Jeff Sharkey
ddba10622d
Clean up InterfaceConfiguration flags.
...
Offer modifier methods for interface flags instead of mutating
directly, and remove square brackets.
Change-Id: I4cce719dccedfb3f0e8448c111e65b93c0008cbb
2011-11-29 18:37:04 -08:00
Steven Ross
f0f2d2438c
Merge "Display max retry lockout message on backup lock fixes 5462647"
2011-11-29 18:34:50 -08:00
Dianne Hackborn
ebac48c6ad
Fix issue #5628789 : Cannot set static/custom wallpaper after clearing Settings data
...
Need to make sure the "files" directory is created.
Change-Id: I8d5b374a5a03590a5ce7fafb5171705414f7b2f9
2011-11-29 18:01:50 -08:00
Mathias Agopian
cadd325aff
add a way to access the version string of the h/w implementation of EGL
...
we use a hidden egl extension. the version string is printed
in SF's dumpsys log.
Change-Id: I123eb4bde6de462bb2404c67b74d6d6219a48d6a
2011-11-29 18:00:35 -08:00
James Dong
44ddd1ff88
Fix the broken build
...
Change-Id: Ib508514891474d24f14ac69d721b0c9c700a0c3f
2011-11-29 18:00:03 -08:00
Gilles Debunne
8a439ac7a3
Performance improvement in TextView
...
Using a SpanSet to minimize the number the calls to getSpans.
This is a cherry pick of 145653 in ICS-MR1
Change-Id: I0a6e1fc7bd7a89325c2925bf98d59626d5e12995
2011-11-29 17:53:40 -08:00
Steven Ross
b9430d2a1c
Display max retry lockout message on backup lock fixes 5462647
...
Change-Id: I75e51f45f821542ae380e4ec4e3232b3fbe660f4
2011-11-29 20:49:08 -05:00
Gilles Debunne
70b34a1e05
Scroll performance improved in multiline TextEdit
...
Measuring line widths, glyph by glyph slows down the scrolling
process for long text (for some reason, width measure efficiency
is affectedi by text length, maybe because the whole text has to
be passed to JNI layers).
This optimization avoids this computation in the case where there
is no possible horizontal scroll.
This is a cherry pick of 145957 into ICS-MR1
Change-Id: I2082e3d0eedace1a86122a03e4b21f90f3bc8522
2011-11-29 17:48:19 -08:00
Mathias Agopian
55d3880eed
am bb1e7d43: Merge changes I7e973a35,Ib3386fcc into ics-mr1
...
* commit 'bb1e7d4324ff43491c526c77f405bbbf0cece611':
SurfaceTexture: add EGL_KHR_fence_sync option
SurfaceTexture: add a blit-to-FBO test
2011-11-29 17:48:01 -08:00
Mathias Agopian
bb1e7d4324
Merge changes I7e973a35,Ib3386fcc into ics-mr1
...
* changes:
SurfaceTexture: add EGL_KHR_fence_sync option
SurfaceTexture: add a blit-to-FBO test
2011-11-29 17:46:35 -08:00
Jamie Gennis
c040e1e779
am 6f1dd757: Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1
...
* commit '6f1dd757cb158d17c76baeb170f7db2271802ef8':
SurfaceMediaSource: use the vid enc usage bit
2011-11-29 17:26:32 -08:00
Jamie Gennis
6f1dd757cb
Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1
2011-11-29 17:25:09 -08:00
Jamie Gennis
77cec6132a
SurfaceTexture: add EGL_KHR_fence_sync option
...
This change adds a compile-time option for SurfaceTexture to use the
EGL_KHR_fence_sync extension to synchronize access to Gralloc buffers.
Bug: 5122031
Change-Id: I7e973a358631fff5308acf377581b811911fe790
2011-11-29 17:09:01 -08:00
Chris Craik
c649180d7c
am f296ee69: Merge "Send animation start notification back to webkit from ui thread" into ics-mr1
...
* commit 'f296ee697409b4b55bef17d534edbc24a4619f0f':
Send animation start notification back to webkit from ui thread
2011-11-29 16:57:29 -08:00
Chris Craik
f296ee6974
Merge "Send animation start notification back to webkit from ui thread" into ics-mr1
2011-11-29 16:55:47 -08:00
Andreas Huber
e7b3e09a5e
am 52607c53: am d12dc284: Merge "If an error occurs that prevents us from reallocating buffers during a format change" into ics-mr1
...
* commit '52607c5364446df6ac5b2f55cb50e146e6023a4f':
If an error occurs that prevents us from reallocating buffers during a format change
2011-11-29 16:33:04 -08:00
Andreas Huber
848bffd8fa
am 074133b2: am 351143fb: Merge "Updated (internal) API for IStreamSource to signal discontinuities" into ics-mr1
...
* commit '074133b260f8d12e484e93b9aa5a33a4983b7349':
Updated (internal) API for IStreamSource to signal discontinuities
2011-11-29 16:33:02 -08:00
Andreas Huber
baeda5135b
Merge "resolved conflicts for merge of 998a929a to master"
2011-11-29 16:31:17 -08:00
Jeff Sharkey
b468a8fd2b
Merge "Move NativeDaemonConnector to varargs."
2011-11-29 15:31:59 -08:00
Dianne Hackborn
500862b44c
am 1808f214: Merge "Fix issue #5636525 : ANR observed in setup wizard after changing language" into ics-mr1
...
* commit '1808f214b0cd7a62628b273b93a1ea688f262565':
Fix issue #5636525 : ANR observed in setup wizard after changing language
2011-11-29 15:30:08 -08:00
Dianne Hackborn
1808f214b0
Merge "Fix issue #5636525 : ANR observed in setup wizard after changing language" into ics-mr1
2011-11-29 15:28:41 -08:00
Chris Craik
d0051c06c2
Send animation start notification back to webkit from ui thread
...
bug:5239801
depends on external/webkit CL: https://android-git.corp.google.com/g/#/c/152559/
Change-Id: I647b5a82680f570c918227dbf57521b862dcfe25
2011-11-29 15:25:47 -08:00
Andreas Huber
a3f887bd30
resolved conflicts for merge of 998a929a to master
...
Change-Id: Id5cfbcf20e5ec28782cc88075040cf9edebfdfe8
2011-11-29 15:14:44 -08:00
Jamie Gennis
d6c938f04e
SurfaceTexture: add a blit-to-FBO test
...
This change adds a test for blitting (via GL rendering) from a
SurfaceTexture to an FBO.
Change-Id: Ib3386fcc3f37153277f3e37a26347441bb80ab58
2011-11-29 14:52:36 -08:00
Irfan Sheriff
a5d24d42ff
Merge "Redesign p2p around provision discovery"
2011-11-29 14:52:18 -08:00
Teng-Hui Zhu
e9dc400c08
am d3788b97: Merge "WebView animation support" into ics-mr1
...
* commit 'd3788b97c9a28e8cbfa4432389a5de04073a333b':
WebView animation support
2011-11-29 14:21:10 -08:00
Teng-Hui Zhu
d3788b97c9
Merge "WebView animation support" into ics-mr1
2011-11-29 14:18:27 -08:00
Romain Guy
7e6077c739
am a9a91ad3: Merge "Improve screenshot animation performance Bug #5525888 " into ics-mr1
...
* commit 'a9a91ad356271c4c4d663223ff42694fbeb1d2a0':
Improve screenshot animation performance Bug #5525888
2011-11-29 14:16:59 -08:00
Romain Guy
a9a91ad356
Merge "Improve screenshot animation performance Bug #5525888 " into ics-mr1
2011-11-29 14:14:44 -08:00
Andreas Huber
3d630e867d
am 564fee36: Merge "Make sure we can properly shutdown even if" into ics-mr1
...
* commit '564fee36667e2699c59a29102136220dc2f65862':
Make sure we can properly shutdown even if
2011-11-29 14:12:21 -08:00
Andreas Huber
52607c5364
am d12dc284: Merge "If an error occurs that prevents us from reallocating buffers during a format change" into ics-mr1
...
* commit 'd12dc28460f622ab29e83fa688ad83a8263e9417':
If an error occurs that prevents us from reallocating buffers during a format change
2011-11-29 14:12:20 -08:00
Andreas Huber
074133b260
am 351143fb: Merge "Updated (internal) API for IStreamSource to signal discontinuities" into ics-mr1
...
* commit '351143fb0e2fcfb7dc2ef1045d693c71eb0ea329':
Updated (internal) API for IStreamSource to signal discontinuities
2011-11-29 14:12:18 -08:00
Andreas Huber
998a929aba
am 405a4e34: Merge "Finer granularity discontinuity support." into ics-mr1
...
* commit '405a4e34032f8a07028138266fe9f79f6753b466':
Finer granularity discontinuity support.
2011-11-29 14:10:09 -08:00
Andreas Huber
564fee3666
Merge "Make sure we can properly shutdown even if" into ics-mr1
2011-11-29 14:09:10 -08:00
Andreas Huber
d12dc28460
Merge "If an error occurs that prevents us from reallocating buffers during a format change" into ics-mr1
2011-11-29 14:09:03 -08:00
Andreas Huber
351143fb0e
Merge "Updated (internal) API for IStreamSource to signal discontinuities" into ics-mr1
2011-11-29 14:08:45 -08:00
Andreas Huber
405a4e3403
Merge "Finer granularity discontinuity support." into ics-mr1
2011-11-29 14:08:13 -08:00
Romain Guy
8279acb965
Improve screenshot animation performance
...
Bug #5525888
Uses only 25% of the original amount of OpenGL API calls
Fillrate usage is now 1x the screen size instead of 5x
Change-Id: Icc7d2793f276fb7ce23c7f652079e54e3d4779d5
2011-11-29 13:56:25 -08:00
Dianne Hackborn
8bf0aa9b2b
Fix issue #5636525 : ANR observed in setup wizard after changing language
...
We could sometimes allow a process to be killed while still waiting for
an activity in it to finish stopping.
Change-Id: Ibf89665c4ad6da6be22de04a82b19ef778a7fda0
2011-11-29 13:54:43 -08:00
Chet Haase
b7a4db0a53
Merge "Fix invalidation of transformed, opaque views"
2011-11-29 13:53:53 -08:00
Chet Haase
8c39defde6
Fix invalidation of transformed, opaque views
...
There is an optimization in the invalidation logic which notes
when opaque views are invalidated and avoids drawing any of the
content behind those views. This runs afoul of some invalidation
logic that invalidates previous positions of views prior to
transforming them. The opaque-dirty optimization guarantees that
the background behind the old positions of these views will not
be painted, causing the views to leave behind artifacts from
their previous positions.
The fix is to disable the optimization when the view in question is
transformed (has a non-identity matrix).
Issue #5678545 : Invalidation logic broken for software-rendered
opaque/transformed views
Change-Id: Ia365ab97725bf36e08797bf319945a52ffca4616
2011-11-29 13:40:39 -08:00
Nick Kralevich
ed089c77ad
allow dumpstate to work with dmesg_restrict=1
...
Ensure that dumpstate has the CAP_SYSLOG permission, so that
it can always read the kernel syslog buffer. This is needed
to ensure that "adb bugreport" shows the dmesg log buffer.
Bug: 5585365
Change-Id: I4b561b77ada83dc875de80fe3ed15743c5958d09
2011-11-29 13:19:18 -08:00
Jeff Brown
0475f82c95
am c339fe30: am be6ab576: Merge "Fix application launch shortcuts." into ics-mr1
...
* commit 'c339fe302bc5083f0a110569eec06676be511088':
Fix application launch shortcuts.
2011-11-29 13:17:42 -08:00
Jeff Brown
c339fe302b
am be6ab576: Merge "Fix application launch shortcuts." into ics-mr1
...
* commit 'be6ab576ff0e3bf2a8dc3feee6f476061afbda30':
Fix application launch shortcuts.
2011-11-29 13:15:51 -08:00
Jeff Brown
be6ab576ff
Merge "Fix application launch shortcuts." into ics-mr1
2011-11-29 13:13:33 -08:00
Mathias Agopian
8e6115f622
Merge "Add support for sending VSYNC events to the framework"
2011-11-29 13:12:32 -08:00
Dianne Hackborn
123ad2823b
am 3788ce9e: am 50b20425: Merge "Another attempt at getting OOM reports to batch." into ics-mr1
...
* commit '3788ce9ed9b896c2f1d5500910e949a6eba308e2':
Another attempt at getting OOM reports to batch.
2011-11-29 13:11:12 -08:00
Mathias Agopian
79f39eb460
Add support for sending VSYNC events to the framework
...
use gui/DisplayEvent to receive the events. Events are
dispatched through a unix pipe, so the API is compatible
with utils/Looper. see gui/DisplayEvent.h for more info.
Bug: 1475048
Change-Id: Ia720f64d1b950328b47b22c6a86042e481d35f09
2011-11-29 13:10:25 -08:00
Dianne Hackborn
3788ce9ed9
am 50b20425: Merge "Another attempt at getting OOM reports to batch." into ics-mr1
...
* commit '50b2042502bc459b40430fe3b3b83d7d61e5daf9':
Another attempt at getting OOM reports to batch.
2011-11-29 13:09:03 -08:00
Mathias Agopian
f9e88fbee0
Fix build.
...
Revert "Add support for sending VSYNC events to the framework"
This reverts commit f3918c5bd4bc9f02f74da42995564150ca2dd382.
Change-Id: I998e3e1aa3fa310829ae973b64fe11b01f6f468f
2011-11-29 13:07:40 -08:00