62810 Commits

Author SHA1 Message Date
Andreas Huber
db85b54395 resolved conflicts for merge of 3d630e86 to master
Change-Id: I9eb7b7c1668b5f0de85ec8b1e9257cf1ec4d8b9e
2011-11-30 09:53:40 -08:00
Narayan Kamath
7a44d68249 Merge "Allow multiple TextToSpeech instances per calling app." 2011-11-30 02:45:22 -08:00
Narayan Kamath
492b7f0d51 Allow multiple TextToSpeech instances per calling app.
We now use an IBinder object as an identity token of the
caller instead of Context#getPackageName.

bug:5680696
Change-Id: I1ca29e7161f709d2a85218206f3f117dfa620282
2011-11-30 10:42:03 +00:00
Wu-cheng Li
12f3e28544 Merge "Add a method to get empty camera parameters." 2011-11-30 00:47:01 -08:00
Wu-cheng Li
020975236c Fix compile error in android_hardware_Camera.cpp.
Change-Id: I06b187deaacb98e01813dbfb8d92a332bfc08fc4
2011-11-30 11:07:08 +08:00
Wu-cheng Li
b4123ef0f9 Merge "Add camera focus move callback." 2011-11-29 18:45:06 -08:00
Steven Ross
f0f2d2438c Merge "Display max retry lockout message on backup lock fixes 5462647" 2011-11-29 18:34:50 -08:00
James Dong
44ddd1ff88 Fix the broken build
Change-Id: Ib508514891474d24f14ac69d721b0c9c700a0c3f
2011-11-29 18:00:03 -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
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
Andreas Huber
a3f887bd30 resolved conflicts for merge of 998a929a to master
Change-Id: Id5cfbcf20e5ec28782cc88075040cf9edebfdfe8
2011-11-29 15:14:44 -08:00
Irfan Sheriff
a5d24d42ff Merge "Redesign p2p around provision discovery" 2011-11-29 14:52:18 -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
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
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
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