Dianne Hackborn
ed032e7873
am 500862b4: am 1808f214: Merge "Fix issue #5636525 : ANR observed in setup wizard after changing language" into ics-mr1
...
* commit '500862b44c8ecbb867144781239bd55b6d3c9489':
Fix issue #5636525 : ANR observed in setup wizard after changing language
2011-11-30 09:58:18 -08:00
Teng-Hui Zhu
0e9f0c3e13
am e9dc400c: am d3788b97: Merge "WebView animation support" into ics-mr1
...
* commit 'e9dc400c080577b74a59085f9c2428c92ee21e16':
WebView animation support
2011-11-30 09:58:02 -08:00
Romain Guy
9e81c791af
am 7e6077c7: am a9a91ad3: Merge "Improve screenshot animation performance Bug #5525888 " into ics-mr1
...
* commit '7e6077c73999d906aa84b8dd4344bab996c75080':
Improve screenshot animation performance Bug #5525888
2011-11-30 09:57:57 -08:00
Andreas Huber
7ba11ef4a0
Merge "resolved conflicts for merge of 3d630e86 to master"
2011-11-30 09:55:47 -08:00
Nick Kralevich
cdc8a01e26
Merge "allow dumpstate to work with dmesg_restrict=1"
2011-11-30 09:55:06 -08:00
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
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
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
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 f3918c5bd4 .
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