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
Yu Shan Emily Lau
9a8246c8d1
am 77d1ebbd: am 4e5d3f2c: Merge "Add the min fps option to set the min fps in the media recorder test. Add the procmem log to the media memory stress test." into ics-mr1
...
* commit '77d1ebbd7bd42d849911e680a63eec02e8b444db':
Add the min fps option to set the min fps in the media recorder test. Add the procmem log to the media memory stress test.
2011-11-28 19:57:26 -08:00
Yu Shan Emily Lau
77d1ebbd7b
am 4e5d3f2c: Merge "Add the min fps option to set the min fps in the media recorder test. Add the procmem log to the media memory stress test." into ics-mr1
...
* commit '4e5d3f2ca05b513640d3163155756e01ae577d54':
Add the min fps option to set the min fps in the media recorder test. Add the procmem log to the media memory stress test.
2011-11-28 19:55:27 -08:00
Yu Shan Emily Lau
4e5d3f2ca0
Merge "Add the min fps option to set the min fps in the media recorder test. Add the procmem log to the media memory stress test." into ics-mr1
2011-11-28 19:53:58 -08:00
Christopher Tate
2f9e260185
am 6d7bd049: am 05160615: Merge "Add iteration-limited mode to FrameworkPerf" into ics-mr1
...
* commit '6d7bd049b02cd24429e540b764c44c8371b7d5eb':
Add iteration-limited mode to FrameworkPerf
2011-11-28 18:00:36 -08:00
Christopher Tate
6d7bd049b0
am 05160615: Merge "Add iteration-limited mode to FrameworkPerf" into ics-mr1
...
* commit '051606150a80efa71b139e9d52fe6c8b2c02c884':
Add iteration-limited mode to FrameworkPerf
2011-11-28 17:58:25 -08:00
Christopher Tate
051606150a
Merge "Add iteration-limited mode to FrameworkPerf" into ics-mr1
2011-11-28 17:56:18 -08:00
Yu Shan Emily Lau
99b4523b75
Add the min fps option to set
...
the min fps in the media recorder test.
Add the procmem log to the media
memory stress test.
Change-Id: Icf82f12adeca7072a171991d1d6a994e4bb7764a
2011-11-28 17:56:02 -08:00
Christopher Tate
80a682bc3d
Add iteration-limited mode to FrameworkPerf
...
You can run tests for exactly N iterations regardless of duration now,
in addition to the previous time-limited behavior.
(Clean cherry-pick to break a dependency on a previous patch that
needs work before being committed.)
Change-Id: I2e6cf511bbe968a6f95391567658722e87dfa1fe
2011-11-28 17:48:55 -08:00
Xia Wang
462a9da4c3
am 4f5434f3: am e5715521: am 2d9f4620: Fix build
...
* commit '4f5434f3a3ce51d7d6caf463e5571bb686e2bdd1':
Fix build
2011-11-28 16:59:20 -08:00
Dianne Hackborn
c0b7f65ae0
am 496f6e2a: am b54980d1: Merge "Fix issue #5588689 : Black camera preview after coming back from gmail" into ics-mr1
...
* commit '496f6e2ad656c5bb8a277e191554d16abd290b58':
Fix issue #5588689 : Black camera preview after coming back from gmail
2011-11-28 16:57:17 -08:00
Xia Wang
4f5434f3a3
am e5715521: am 2d9f4620: Fix build
...
* commit 'e5715521232443f01f8c0c0633cac364c8136bde':
Fix build
2011-11-28 16:57:14 -08:00
Dianne Hackborn
496f6e2ad6
am b54980d1: Merge "Fix issue #5588689 : Black camera preview after coming back from gmail" into ics-mr1
...
* commit 'b54980d1d4d903f68cdfa952256afff01902cd94':
Fix issue #5588689 : Black camera preview after coming back from gmail
2011-11-28 16:55:05 -08:00
Xia Wang
e571552123
am 2d9f4620: Fix build
...
* commit '2d9f4620625405b916aa27177a6b5f82f8e5b15d':
Fix build
2011-11-28 16:53:50 -08:00
Dianne Hackborn
b54980d1d4
Merge "Fix issue #5588689 : Black camera preview after coming back from gmail" into ics-mr1
2011-11-28 16:53:00 -08:00
Xia Wang
2d9f462062
Fix build
...
Change-Id: I465d85e4783763f311ed6ec0a09c1edde9712405
2011-11-28 16:49:06 -08:00
Romain Guy
cb52d67600
am 02e88f23: am 46685db9: Merge "Fix crash in existing applications Bug #5659476 " into ics-mr1
...
* commit '02e88f23a65c602e83d7a46c0925e653b948e418':
Fix crash in existing applications Bug #5659476
2011-11-28 16:11:27 -08:00
Romain Guy
02e88f23a6
am 46685db9: Merge "Fix crash in existing applications Bug #5659476 " into ics-mr1
...
* commit '46685db957cc01cef4ba198aafe44d99fe31f62c':
Fix crash in existing applications Bug #5659476
2011-11-28 16:08:52 -08:00
Xia Wang
7480255799
am 6c509ef0: am da822367: am 25261f59: Merge "Increase time between wifi stop and wifi start: set to 2 minutes http://b/issue?id=5629901 " into ics-mr0
...
* commit '6c509ef0bad761feecfd94b66d532ae05b450317':
Increase time between wifi stop and wifi start: set to 2 minutes http://b/issue?id=5629901
2011-11-28 16:07:13 -08:00
Romain Guy
46685db957
Merge "Fix crash in existing applications Bug #5659476 " into ics-mr1
2011-11-28 16:06:52 -08:00
Xia Wang
6c509ef0ba
am da822367: am 25261f59: Merge "Increase time between wifi stop and wifi start: set to 2 minutes http://b/issue?id=5629901 " into ics-mr0
...
* commit 'da822367886d68f997153c7edd5368f3dfb6d58d':
Increase time between wifi stop and wifi start: set to 2 minutes http://b/issue?id=5629901
2011-11-28 16:04:39 -08:00
Xia Wang
da82236788
am 25261f59: Merge "Increase time between wifi stop and wifi start: set to 2 minutes http://b/issue?id=5629901 " into ics-mr0
...
* commit '25261f59af0d902f239e541b735f7dc31e714b07':
Increase time between wifi stop and wifi start: set to 2 minutes http://b/issue?id=5629901
2011-11-28 16:02:44 -08:00
Xia Wang
25261f59af
Merge "Increase time between wifi stop and wifi start: set to 2 minutes http://b/issue?id=5629901 " into ics-mr0
2011-11-28 16:00:49 -08:00
Chet Haase
d3ea6b40bb
am 38928899: am 8990cb57: Merge "Fix flashing wifi dialog after rotating back from landscape." into ics-mr1
...
* commit '3892889952b0ad3fa0b095c96d8ae2ae110585e2':
Fix flashing wifi dialog after rotating back from landscape.
2011-11-28 15:47:16 -08:00
Chet Haase
3892889952
am 8990cb57: Merge "Fix flashing wifi dialog after rotating back from landscape." into ics-mr1
...
* commit '8990cb5768efba46bb1d7458377dd44498afcfdb':
Fix flashing wifi dialog after rotating back from landscape.
2011-11-28 15:45:32 -08:00
Chet Haase
8990cb5768
Merge "Fix flashing wifi dialog after rotating back from landscape." into ics-mr1
2011-11-28 15:43:23 -08:00
Chet Haase
08837c246c
Fix flashing wifi dialog after rotating back from landscape.
...
There was an error in some of the OpenGL layer logic such that we would
occasionally set up a layer for rendering and then not clean up when it was
done. This caused future OpenGL rendering to go into that layer instead of
to the buffers being displayed on the screen, resulting in artifacts including
flashes and displaying of stale content. This happened specifically when
using the wifi settings dialog with the InputMethod keyboard displayed,
but it was probably visible in other situations as well.
Issue #5628248 : Flickering/flashing after entering password for WiFi
Change-Id: I38139f620b310f4309570fa7224552d2ee633999
2011-11-28 15:19:22 -08:00
Romain Guy
ff98fa5a84
Fix crash in existing applications
...
Bug #5659476
The FontRenderer was not cleaning up its temporary state, leading
to crashes when invoking renderDropShadow.
Change-Id: I43b24820dd5625af8c080bbe11b64de2f74164b2
2011-11-28 14:55:56 -08:00
Glenn Kasten
589364c717
Merge "Make AudioTrack a RefBase so wrappers not needed"
2011-11-28 14:54:28 -08:00
Dianne Hackborn
6d05fd3c79
Fix issue #5588689 : Black camera preview after coming back from gmail
...
Make surface management between SurfaceView and the window manager
much more controlled, to ensure that SurfaceView always gets to report
the current surface is destroyed before the window manager actually
destroys it.
Also a small tweak to allow windows that have a wallpaper background
to still have a preview window. This makes launching home after it
has been killed feel much more responsive.
Change-Id: I0d22cf178a499601a770cb1dbadef7487e392d85
2011-11-28 14:45:50 -08:00
Eric Rowe
866103c00d
am 70a1ee38: am 500afb87: Merge "Fix SCO start stop tests." into ics-mr1
...
* commit '70a1ee38b24a7c8dfc789db024bdf54f277ddba3':
Fix SCO start stop tests.
2011-11-28 14:28:35 -08:00
Eric Rowe
70a1ee38b2
am 500afb87: Merge "Fix SCO start stop tests." into ics-mr1
...
* commit '500afb87a7a8b5928ef1a5196bdfd0bcc2b87e4a':
Fix SCO start stop tests.
2011-11-28 14:26:39 -08:00
Eric Rowe
500afb87a7
Merge "Fix SCO start stop tests." into ics-mr1
2011-11-28 12:32:34 -08:00
Narayan Kamath
31825c1199
am be1b5ce4: am a6f8ebc6: Merge "Fix TTS instantiation from webview accessibility handlers." into ics-mr1
...
* commit 'be1b5ce498a68e28d47a167495f47787d6461e88':
Fix TTS instantiation from webview accessibility handlers.
2011-11-28 10:42:00 -08:00
Narayan Kamath
be1b5ce498
am a6f8ebc6: Merge "Fix TTS instantiation from webview accessibility handlers." into ics-mr1
...
* commit 'a6f8ebc616cfe3185ae2513ef2f846e8d32b551e':
Fix TTS instantiation from webview accessibility handlers.
2011-11-28 10:39:07 -08:00
Derek Sollenberger
376690c00f
am aceb7f8b: am 425c595a: Merge "Update Webkit with the zoom level after double tap gesture" into ics-mr1
...
* commit 'aceb7f8b29bdcf8bf7fdc14ec9b99f54f2a2a3d2':
Update Webkit with the zoom level after double tap gesture
2011-11-28 10:38:41 -08:00
Narayan Kamath
a6f8ebc616
Merge "Fix TTS instantiation from webview accessibility handlers." into ics-mr1
2011-11-28 10:36:32 -08:00
Ben Murdoch
e189f0c6db
am b11387a6: am 2ffc9ec3: Ensure we dismiss the <select> option dialog.
...
* commit 'b11387a6e51c424e421b0951de20db46a5f5c992':
Ensure we dismiss the <select> option dialog.
2011-11-28 10:36:22 -08:00
Derek Sollenberger
aceb7f8b29
am 425c595a: Merge "Update Webkit with the zoom level after double tap gesture" into ics-mr1
...
* commit '425c595acb798ed9652b5a1f0e5412cbd8e3873d':
Update Webkit with the zoom level after double tap gesture
2011-11-28 10:35:57 -08:00
Derek Sollenberger
425c595acb
Merge "Update Webkit with the zoom level after double tap gesture" into ics-mr1
2011-11-28 10:34:04 -08:00
Ben Murdoch
b11387a6e5
am 2ffc9ec3: Ensure we dismiss the <select> option dialog.
...
* commit '2ffc9ec3d69d8ee95bce1ccf17163a70b0bd9003':
Ensure we dismiss the <select> option dialog.
2011-11-28 10:33:48 -08:00
Narayan Kamath
68e2af55d6
Fix TTS instantiation from webview accessibility handlers.
...
The TTS instantiated from here shouldn't clobber any
existing TTS objects opened within the same package context.
Ideally, the TTS API should work fine with multiple TTS object
instances within the same package context but making that happen
correctly is a larger change.
bug:5659758
Change-Id: Ia1f63c61b9f12ac92ff42a427a004d414e42a759
2011-11-28 17:49:01 +00:00
Derek Sollenberger
8fae09d575
Update Webkit with the zoom level after double tap gesture
...
In the hardware accelerated case we were not updating webkit
with the new zoom information. This was causing plugins to
render at the old zoom level.
bug: 5663981
Change-Id: I3cb18ad9ca4f185f384ea9fb68780f29160391ad
2011-11-28 11:51:26 -05:00
Ben Murdoch
2ffc9ec3d6
Ensure we dismiss the <select> option dialog.
...
When the WebView is paused, or another action (such as navigating to
a new URL) occurs, cancel any ongoing <select> tag dialog that is open.
Bug: 5666545
Change-Id: Ifc35a239b729ed93cbf82b2096334f7d63f8993d
2011-11-28 16:47:55 +00:00
Logan Chien
12be3fff12
Remove dead code.
...
Change-Id: I2838a40026291e7345b07911af3ba17278b63ffe
2011-11-27 08:42:11 +08:00
Jeff Brown
b145ae9eca
Merge "Use sized integer typedefs in hash_type specializations."
2011-11-24 12:21:46 -08:00
Jeff Brown
bbd63f0246
Use sized integer typedefs in hash_type specializations.
...
Change-Id: I3f9e004db2f3be1cb43a885c3ae142f251fd6845
2011-11-24 11:54:21 -08:00
Narayan Kamath
6ddbe5b587
am b567c41b: am e35581ad: Merge "Fix regressions in TTS completion callbacks." into ics-mr1
...
* commit 'b567c41b00fd196a2994f3cf8090b8a503c04939':
Fix regressions in TTS completion callbacks.
2011-11-24 09:41:48 -08:00
Narayan Kamath
b567c41b00
am e35581ad: Merge "Fix regressions in TTS completion callbacks." into ics-mr1
...
* commit 'e35581ad5ad635f9dcfe4ab6a432c48b46b782cd':
Fix regressions in TTS completion callbacks.
2011-11-24 09:40:04 -08:00
Narayan Kamath
e35581ad5a
Merge "Fix regressions in TTS completion callbacks." into ics-mr1
2011-11-24 09:38:15 -08:00