63064 Commits

Author SHA1 Message Date
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
Dianne Hackborn
50b2042502 Merge "Another attempt at getting OOM reports to batch." into ics-mr1 2011-11-29 13:05:26 -08:00
Dianne Hackborn
672342c309 Another attempt at getting OOM reports to batch.
We now generate a stack-trace looking thing at the top of the report.

Also fix a bug I hit where the phone window manager was sending a
broadcast before the boot had completed.

Change-Id: I0cee16180e4d05c9bd3fe715212a28f504ec91ac
2011-11-29 12:55:50 -08:00
Jeff Brown
6651a63834 Fix application launch shortcuts.
Improved quick launch bookmarks to support category-based shortcuts
instead of hardcoding package and class names for all apps.

Added a set of Intent categories for typical applications on the
platform.

Added support for some of the HID application launch usages to
reduce reliance on quick launch for special purpose keys.  Some
keyboard vendors have hardcoded launch keys that synthesize
"Search + X" type key combos.  The goal is to encourage them
to stop doing this by implementing more of HID.

Bug: 5674723
Change-Id: I79f1147c65a208efc3f67228c9f0fa5cd050c593
2011-11-29 12:17:22 -08:00
Jeff Sharkey
31c6e4817f Move NativeDaemonConnector to varargs.
Perform uniform argument escaping inside NativeDaemonConnector, using
varargs to separate boundaries.  Also move to parsed NativeDaemonEvent
instances instead of raw Strings.

Bug: 5472606
Change-Id: I1270733e2b2eeb2f6b810240df82ab24d38ebf40
2011-11-29 12:09:06 -08:00
The Android Automerger
80cf2a7526 merge in ics-mr1-release history after reset to ics-mr1 2011-11-29 12:03:07 -08:00
Andreas Huber
a10613fea8 Updated (internal) API for IStreamSource to signal discontinuities
Change-Id: Idd4b9d8e7cec16b3e3c91c70e75144d42be30f96
related-to-bug: 5553055
2011-11-29 11:59:10 -08:00
Eric Fischer
e11ec1df42 am 47af771d: (-s ours) am 9ab3c624: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '47af771d708c8eb8f7debf7e295d609491f03cc8':
  Import revised translations.  DO NOT MERGE
2011-11-29 11:51:20 -08:00
Eric Fischer
47af771d70 am 9ab3c624: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '9ab3c62499c054b600699fb107c28fc8926ca5a1':
  Import revised translations.  DO NOT MERGE
2011-11-29 11:47:08 -08:00
Mathias Agopian
aa2892edc7 Merge changes If4126023,Iacda2386,I1eb691f7,Ib56139f8
* changes:
  Add support for sending VSYNC events to the framework
  BitTube::read now handles EAGAIN
  split ComposerService out of SurfaceComposerClient.h
  rewrite SF's message loop on top of Looper
2011-11-29 11:47:03 -08:00
Eric Fischer
9ab3c62499 Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-11-29 11:44:59 -08:00
Mathias Agopian
f3918c5bd4 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: If4126023fc9c067e56087ec7d16a8fd542ce1794
2011-11-29 11:44:05 -08:00
Mathias Agopian
bb9ba8bae5 BitTube::read now handles EAGAIN
Change-Id: Iacda2386342ba0727bbf278f6c597488d5467bb8
2011-11-29 11:42:59 -08:00
Eric Fischer
fa56c714f2 Import revised translations. DO NOT MERGE
Change-Id: Ia50fd44ea4492188f481e652caae940acaf961e2
2011-11-29 11:42:53 -08:00
Mathias Agopian
1e773932a1 am db0bc7d4: am 3f2730c5: Merge "temporarily hardcode Nexus S refresh rate" into ics-mr1
* commit 'db0bc7d46cacb6446deb7c59d39ce563846d7071':
  temporarily hardcode Nexus S refresh rate
2011-11-29 11:39:49 -08:00
Mathias Agopian
db0bc7d46c am 3f2730c5: Merge "temporarily hardcode Nexus S refresh rate" into ics-mr1
* commit '3f2730c5317700e3ae5412b5c825a747b591ebc2':
  temporarily hardcode Nexus S refresh rate
2011-11-29 11:36:54 -08:00
Mathias Agopian
3f2730c531 Merge "temporarily hardcode Nexus S refresh rate" into ics-mr1 2011-11-29 11:35:07 -08:00
Eric Fischer
9b4268697f Merge "Import revised translations." 2011-11-29 11:09:51 -08:00
Eric Fischer
4a97ebfec5 Import revised translations.
Change-Id: Ie43246df49b8f6ef3daef12e0d8fb5c2f573874e
2011-11-29 10:29:25 -08:00