Andreas Huber
136486defa
resolved conflicts for merge of 3d630e86 to master
...
Change-Id: I9eb7b7c1668b5f0de85ec8b1e9257cf1ec4d8b9e
2011-11-30 09:53:40 -08:00
Narayan Kamath
b3f9c70faa
Merge "Allow multiple TextToSpeech instances per calling app."
2011-11-30 02:45:22 -08:00
Wu-cheng Li
48bd6e096c
Merge "Add a method to get empty camera parameters."
2011-11-30 00:47:01 -08:00
Wu-cheng Li
782cc8e8a7
Merge "Add camera focus move callback."
2011-11-29 18:45:06 -08:00
Steven Ross
9696c9769e
Merge "Display max retry lockout message on backup lock fixes 5462647"
2011-11-29 18:34:50 -08:00
Andreas Huber
9a90b82f0b
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
ef40a5b77e
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
d2041b810e
Merge "resolved conflicts for merge of 998a929a to master"
2011-11-29 16:31:17 -08:00
Jeff Sharkey
0c66eb20fc
Merge "Move NativeDaemonConnector to varargs."
2011-11-29 15:31:59 -08:00
Andreas Huber
1371ecced5
resolved conflicts for merge of 998a929a to master
...
Change-Id: Id5cfbcf20e5ec28782cc88075040cf9edebfdfe8
2011-11-29 15:14:44 -08:00
Irfan Sheriff
484bc2727c
Merge "Redesign p2p around provision discovery"
2011-11-29 14:52:18 -08:00
Andreas Huber
94547b18a9
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
e872046f28
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
ed6671ae3a
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
2f91d3ebca
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
8f2b02be3c
Merge "Make sure we can properly shutdown even if" into ics-mr1
2011-11-29 14:09:10 -08:00
Andreas Huber
f40dde90b8
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
63f0959613
Merge "Updated (internal) API for IStreamSource to signal discontinuities" into ics-mr1
2011-11-29 14:08:45 -08:00
Andreas Huber
92075ff809
Merge "Finer granularity discontinuity support." into ics-mr1
2011-11-29 14:08:13 -08:00
Chet Haase
9c59b5170a
Merge "Fix invalidation of transformed, opaque views"
2011-11-29 13:53:53 -08:00
Jeff Brown
47c70d98d4
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
fed0daed87
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
191d77be36
Merge "Fix application launch shortcuts." into ics-mr1
2011-11-29 13:13:33 -08:00
Mathias Agopian
cb38a34257
Merge "Add support for sending VSYNC events to the framework"
2011-11-29 13:12:32 -08:00
Dianne Hackborn
d17ba48773
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
d0566bc26f
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
57dd63caa6
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
439cf8576d
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
cf3c682c88
Merge "Another attempt at getting OOM reports to batch." into ics-mr1
2011-11-29 13:05:26 -08:00
Jeff Brown
9ee44c8f94
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
Eric Fischer
4a0994e4ab
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
46b547efd8
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
8219e9122e
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
0c06ad7ee1
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
2011-11-29 11:44:59 -08:00
Mathias Agopian
461afeb9fd
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
3ad3807a5c
BitTube::read now handles EAGAIN
...
Change-Id: Iacda2386342ba0727bbf278f6c597488d5467bb8
2011-11-29 11:42:59 -08:00
Mathias Agopian
4c810740e7
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
4c2384c26f
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
623f5d61b9
Merge "temporarily hardcode Nexus S refresh rate" into ics-mr1
2011-11-29 11:35:07 -08:00
Eric Fischer
2bc359aafc
Merge "Import revised translations."
2011-11-29 11:09:51 -08:00
Dianne Hackborn
8f74c9980c
am e2d76314: am 9b518d93: Merge "Fix issue #5642121 : Proximity sensor didn\'t turn the screen on in call" into ics-mr1
...
* commit 'e2d76314cdd64cc69c791af0ee2fd2bbcc0425ba':
Fix issue #5642121 : Proximity sensor didn't turn the screen on in call
2011-11-29 10:20:03 -08:00
Dianne Hackborn
89369172f7
am 9b518d93: Merge "Fix issue #5642121 : Proximity sensor didn\'t turn the screen on in call" into ics-mr1
...
* commit '9b518d9304eb4ad17591944926231b661a3dfce0':
Fix issue #5642121 : Proximity sensor didn't turn the screen on in call
2011-11-29 10:17:42 -08:00
Dianne Hackborn
8f0995738b
Merge "Fix issue #5642121 : Proximity sensor didn't turn the screen on in call" into ics-mr1
2011-11-29 10:16:11 -08:00
Jaikumar Ganesh
3455cba607
am f4e41c35: am eb701df8: Merge "Cleanup references when turning BT off." into ics-mr1
...
* commit 'f4e41c35387728720780935564a491cf9bf1357e':
Cleanup references when turning BT off.
2011-11-29 10:09:40 -08:00
Jaikumar Ganesh
2866f4ad68
am 910ae39f: am ff33b94e: Merge "Cleanup static references when quitting." into ics-mr1
...
* commit '910ae39f8a12bcb917b7eb1da3f701925da79509':
Cleanup static references when quitting.
2011-11-29 10:09:38 -08:00
Gilles Debunne
bb03013a63
Merge "Restoring mLayout has private in TextView"
2011-11-29 10:09:25 -08:00
Jaikumar Ganesh
395567a9d4
am eb701df8: Merge "Cleanup references when turning BT off." into ics-mr1
...
* commit 'eb701df88cb3027d6323f9e2607cbe4d5ca93ac2':
Cleanup references when turning BT off.
2011-11-29 10:07:09 -08:00
Jaikumar Ganesh
a2a0b7a053
am ff33b94e: Merge "Cleanup static references when quitting." into ics-mr1
...
* commit 'ff33b94e236fcde3833fba698d32d0e6b98fa303':
Cleanup static references when quitting.
2011-11-29 10:07:07 -08:00
Jaikumar Ganesh
da1053de0d
Merge "Cleanup references when turning BT off." into ics-mr1
2011-11-29 10:05:27 -08:00
Jaikumar Ganesh
8d9b517bd0
Merge "Cleanup static references when quitting." into ics-mr1
2011-11-29 10:05:13 -08:00