64501 Commits

Author SHA1 Message Date
Christopher Tate
ac8473709e 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:22 -08:00
Christopher Tate
051606150a Merge "Add iteration-limited mode to FrameworkPerf" into ics-mr1 2011-11-28 17:56:18 -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
89205682cb am e5715521: am 2d9f4620: Fix build
* commit 'e5715521232443f01f8c0c0633cac364c8136bde':
  Fix build
2011-11-28 16:57:00 -08:00
Dianne Hackborn
5e3064c67f 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:54:56 -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
8b435d966a 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:47 -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
d65eedc608 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:33 -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
ec5f7df910 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:30 -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
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
22d196200d am 500afb87: Merge "Fix SCO start stop tests." into ics-mr1
* commit '500afb87a7a8b5928ef1a5196bdfd0bcc2b87e4a':
  Fix SCO start stop tests.
2011-11-28 14:27:07 -08:00
Eric Rowe
500afb87a7 Merge "Fix SCO start stop tests." into ics-mr1 2011-11-28 12:32:34 -08:00
Narayan Kamath
456ce6f899 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:05 -08:00
Narayan Kamath
a6f8ebc616 Merge "Fix TTS instantiation from webview accessibility handlers." into ics-mr1 2011-11-28 10:36:32 -08:00
Derek Sollenberger
3768a075c8 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:58 -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
7ba39c4134 am 2ffc9ec3: Ensure we dismiss the <select> option dialog.
* commit '2ffc9ec3d69d8ee95bce1ccf17163a70b0bd9003':
  Ensure we dismiss the <select> option dialog.
2011-11-28 10:33:40 -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
Narayan Kamath
b1b50be997 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:17 -08:00
Narayan Kamath
e35581ad5a Merge "Fix regressions in TTS completion callbacks." into ics-mr1 2011-11-24 09:38:15 -08:00
Narayan Kamath
40f71f0be3 Fix regressions in TTS completion callbacks.
(a) onUtteranceCompleted should be called on errors too. Also,
fix up the error handling so that onUtteranceCompleted is
always called.
(b) Don't treat empty utterances as errors, and let the engine
synthesize them, as before.

bug:5662598
Change-Id: I9223592bc6fe5f47d71103f4f02f046b54a655a8
2011-11-24 17:32:12 +00:00
Irfan Sheriff
38e09deaf5 am 7b6d238b: Merge "Fix tethering interaction from wifi" into ics-mr1
* commit '7b6d238b7515fdd070c361a03e99e6022f2cd2ba':
  Fix tethering interaction from wifi
2011-11-23 19:19:56 -08:00
Irfan Sheriff
7b6d238b75 Merge "Fix tethering interaction from wifi" into ics-mr1 2011-11-23 19:18:22 -08:00
John Wang
1212d241b3 am e95f4986: Merge "Fix a build break." into ics-mr1
* commit 'e95f49869b02dd9792718fb1075241acdf6ca775':
  Fix a build break.
2011-11-23 16:50:08 -08:00
John Wang
e95f49869b Merge "Fix a build break." into ics-mr1 2011-11-23 16:48:32 -08:00
Adam Cohen
78a73e4f30 am 8ce22f26: Fixing a typo in framework widget padding
* commit '8ce22f2644acb51bfe0b9d600f1d2ad64e80513c':
  Fixing a typo in framework widget padding
2011-11-23 16:41:03 -08:00
Adam Cohen
8ce22f2644 Fixing a typo in framework widget padding
Change-Id: I90733500487b3e9fb1ff19a7b946d6faf526a2c1

Conflicts:

	core/res/res/values-sw600dp/dimens.xml
2011-11-23 16:31:53 -08:00
John Wang
b74ecb1d45 Fix a build break.
Change-Id: I2a9ceaace02f442c5e36fa8425b051116c81e76f
2011-11-23 16:26:13 -08:00
John Wang
adddb52ddc am 9b108009: Check watingApns before access it.
* commit '9b1080091c4ac97378db366cdd6961aba28756c5':
  Check watingApns before access it.
2011-11-23 15:37:11 -08:00
John Wang
9b1080091c Check watingApns before access it.
bug:5663125
Change-Id: I66275fafd316f318f9035ac11c16a30fcb32f7c8
2011-11-23 14:26:38 -08:00
Eric Laurent
e49f706479 am 20398fac: Merge "audioflinger: reduce sleep time to avoid underrun" into ics-mr1
* commit '20398fac99ff78cb3ec3dd122930e45d409e0524':
  audioflinger: reduce sleep time to avoid underrun
2011-11-23 12:32:30 -08:00
Eric Laurent
20398fac99 Merge "audioflinger: reduce sleep time to avoid underrun" into ics-mr1 2011-11-23 12:31:04 -08:00
Michael Chan
4753318b11 am 37ac88f9: Merge "Update description of account_type" into ics-mr1
* commit '37ac88f994c5b8af291acd9c8d7eb5e22ce3c489':
  Update description of account_type
2011-11-23 12:16:04 -08:00
Michael Chan
37ac88f994 Merge "Update description of account_type" into ics-mr1 2011-11-23 12:12:51 -08:00
Robert Greenwalt
e0c3a2e063 am eaeb4f4e: Merge "Fix some policy-base routing issues." into ics-mr1
* commit 'eaeb4f4e3c914550d28a042fb3d752efcf20ab9e':
  Fix some policy-base routing issues.
2011-11-23 11:27:04 -08:00
Robert Greenwalt
eaeb4f4e3c Merge "Fix some policy-base routing issues." into ics-mr1 2011-11-23 11:25:39 -08:00
Irfan Sheriff
c74694d5e1 Fix tethering interaction from wifi
- Use the right interface for untether

- Wait till tethering service confirms that untether() is successful before
shutting down soft Ap. This helps to make sure interface does not go away
before clean up is done.

Bug: 5659166
Change-Id: Iff9d4a67ff40664c2114e766590d6a83b7739738
2011-11-23 10:05:05 -08:00
Robert Greenwalt
e83d181606 Fix some policy-base routing issues.
Secondary nets sometimes come up with no routes, but parsing errors end up with null
routes getting added.  Trim that away.  Also added some dumpstate logging of the secondary
route tables and rules.

bug:5615697
Change-Id: I94c9d888bab958df44891b9117236436e046cc7f
2011-11-23 09:36:16 -08:00
Eric Rowe
fca8e9d919 Fix SCO start stop tests.
Change-Id: Idf292bc244a494e2ffb11359e83c0d072907ea3b
Bug-id: http://b/5644683
2011-11-22 19:16:50 -08:00
Eric Laurent
f1f5fc85b0 audioflinger: reduce sleep time to avoid underrun
Progressively reduce the sleep time applied in MixerThread::threadLoop()
in case of consecutive application underruns to avoid starving the audio HAL.
As the default sleep time is longer than the duration of an audio buffer
we ended up writing less data than needed by the audio HAL if
the condition persisted.

Issue 5553055.

Change-Id: I2b23ee79c032efa945025db228beaecd1e07a2e5
2011-11-22 18:50:29 -08:00