29282 Commits

Author SHA1 Message Date
Irfan Sheriff
b43ae28951 Merge "cache configured networks" 2010-08-24 08:30:49 -07:00
Mike Lockwood
8c68865649 Merge "MTP: Check and clear exceptions after calling into Java in MtpDatabase" 2010-08-24 08:28:54 -07:00
Mike Lockwood
0a7fa0a868 MTP: Check and clear exceptions after calling into Java in MtpDatabase
Change-Id: I805858c66fe57208c06aa624d16b72966555e005
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-08-24 11:25:28 -04:00
Steve Block
f24079a28f Merge "Merge WebKit at r65615 : Ignore http/tests/appcache/origin-quota.html" 2010-08-24 07:51:07 -07:00
Derek Sollenberger
41d5e93bbd Move APK monitoring into WebView.
This CL adds the monitoring logic that was removed from the Browser
in a companion CL.  This allows applications other than the Browser
to use special features offered by YouTube and plugins. Additionally,
the pluginManager was refactored to prevent code duplication between
the manager and WebView.

Change-Id: Ie37f248c8edd9d06ae1fd6675dd5f06f04774b09
http://b/2834603
2010-08-24 09:31:59 -04:00
Kristian Monsen
f52435569c Merge "Java calls to get Android specific files." 2010-08-24 04:50:12 -07:00
Iain Merrick
558f7dcf05 Merge WebKit at r65615 : Ignore http/tests/appcache/origin-quota.html
This patch modifies the old-style hard-coded ignore list. The new-style
text file (in external/webkit/LayoutTests/platform/android) has been
modified separately, as part of the normal WebKit merge process.

Test added in http://trac.webkit.org/changeset/64613
Needs clearAllApplicationCaches() callback. See http://b/issue?id=2944196

Change-Id: I31655c363c93eada40d01123e9c14c0d03bdba7b
2010-08-24 12:15:54 +01:00
Chia-chi Yeh
2ac479faeb am a83987d2: Merge "RTP: integrate the echo canceller from speex." into gingerbread
Merge commit 'a83987d2ccc6b235dd3dd5cc6206c257dfe9e0a8' into gingerbread-plus-aosp

* commit 'a83987d2ccc6b235dd3dd5cc6206c257dfe9e0a8':
  RTP: integrate the echo canceller from speex.
2010-08-24 02:30:14 -07:00
Chia-chi Yeh
a83987d2cc Merge "RTP: integrate the echo canceller from speex." into gingerbread 2010-08-24 02:28:41 -07:00
Chia-chi Yeh
4ae6ec428f RTP: integrate the echo canceller from speex.
Currently the filter_length is set to one second.
Will change that when we have a better idea.

Change-Id: Ia942a8fff00b096de8ff0049a448816ea9a68068
2010-08-24 16:04:18 +08:00
Chia-chi Yeh
50246cd5df am 5b1f0c9f: Merge "RTP: reduce the latency by overlapping AudioRecord and AudioTrack." into gingerbread
Merge commit '5b1f0c9f6416719ef6194dd0c4e0f626ec84082c' into gingerbread-plus-aosp

* commit '5b1f0c9f6416719ef6194dd0c4e0f626ec84082c':
  RTP: reduce the latency by overlapping AudioRecord and AudioTrack.
2010-08-23 23:37:49 -07:00
Brad Fitzpatrick
0b7b980761 am d132892a: Merge "Don\'t touch the VFS during window relayout." into gingerbread
Merge commit 'd132892a75532557bb18af14eab6081704b7fa6d' into gingerbread-plus-aosp

* commit 'd132892a75532557bb18af14eab6081704b7fa6d':
  Don't touch the VFS during window relayout.
2010-08-23 23:37:17 -07:00
Jean-Baptiste Queru
bacc3aa85e am 97b5b765: merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward
Merge commit '97b5b7650236dd102fa48b51d9361289724a50e9' into gingerbread-plus-aosp

* commit '97b5b7650236dd102fa48b51d9361289724a50e9':
  Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.
  Amend previous ndc commit
  Add a method to let a properly permissioned app directly
  Changed SyncOperation.toKey() to not rely on the implementation of
  Squashed commit of the following:
  Add more error checking for ndc
  PackageManagerService: always install native binaries from .apk
  Add PhoneSubInfo.getCompleteVoiceMailNumber.
  Fix a bug where we cleaned an apps external data when upgrading it. :(
  Skip hostname verification when using insecure factory
  Flush binder buffer after setting raw heap to avoid leaking a reference.
  Fix issue #2834005: Android Settings.Secure bypass
  Fix issue 2811538: System server crash when disconnecting BT headset after using SCO off call.
  Verify hostname where possible, and clarify where not.
2010-08-23 23:37:06 -07:00
Chia-chi Yeh
5b1f0c9f64 Merge "RTP: reduce the latency by overlapping AudioRecord and AudioTrack." into gingerbread 2010-08-23 23:28:45 -07:00
Chia-chi Yeh
2880ef86e5 RTP: reduce the latency by overlapping AudioRecord and AudioTrack.
Change-Id: I00d750ee514ef68d5b2a28bd1893417ed70ef1fc
2010-08-24 13:58:12 +08:00
Chih-Chung Chang
27b257dbcd am 3a59ddc6: (-s ours) am dc2eabd1: Merge "Don\'t recycle native bitmap after the finalizer is called." into gingerbread
Merge commit '3a59ddc67c6ad33c01d36338603586f90d94e71b'

* commit '3a59ddc67c6ad33c01d36338603586f90d94e71b':
  Don't recycle native bitmap after the finalizer is called.
2010-08-23 19:56:34 -07:00
Brad Fitzpatrick
d132892a75 Merge "Don't touch the VFS during window relayout." into gingerbread 2010-08-23 19:38:16 -07:00
Jean-Baptiste Queru
97b5b76502 merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward
Change-Id: I69ed3eabde3cd32bea57315c0f031839caea4d4e
2010-08-23 19:08:27 -07:00
Dianne Hackborn
6e549d1c99 am f467ca08: Merge "More watermark work." into gingerbread
Merge commit 'f467ca08dda9efece674efb0cc70c45fab4973a6' into gingerbread-plus-aosp

* commit 'f467ca08dda9efece674efb0cc70c45fab4973a6':
  More watermark work.
2010-08-23 19:01:03 -07:00
Dianne Hackborn
f467ca08dd Merge "More watermark work." into gingerbread 2010-08-23 18:57:37 -07:00
Dianne Hackborn
214a7fde36 Merge "Make Theme.Holo the default theme for new apps." 2010-08-23 18:53:06 -07:00
Dianne Hackborn
3e6d50cc48 Make Theme.Holo the default theme for new apps.
Also change Holo to have an action bar, instead of a title bar.

Change-Id: I45c2f06938509ae02cde99d1c06c228f86e8e3e8
2010-08-23 18:51:26 -07:00
Jaikumar Ganesh
d9a3d1c215 Merge "Add BNEP_SVC UUID for incoming tethering connections." 2010-08-23 18:33:18 -07:00
Jaikumar Ganesh
34536183f4 Add BNEP_SVC UUID for incoming tethering connections.
Change-Id: I90c24edfd133ac9fa89c3467383cd61fa23954c6
2010-08-23 18:32:03 -07:00
Brad Fitzpatrick
9088100518 Don't touch the VFS during window relayout.
yaffs2 is single-threaded and any disk access during window drawing
(or animation in this case) can cause UI stutters / unresponsiveness
for hundreds of milliseconds.

BUG=2941119

Change-Id: Ifdce8337027ab25d1ea844934fa787ffe68263c4
2010-08-23 18:30:08 -07:00
Adam Powell
208e3c586d Merge "Fix some issues with touch event splitting around event timing" 2010-08-23 18:20:56 -07:00
Adam Powell
816c3be1d7 Fix some issues with touch event splitting around event timing
Change-Id: I15d04d226c218ad7b8a5fe43a55c33c3ade2128d
2010-08-23 18:00:14 -07:00
Dirk Dougherty
976b71e2e0 am afdc85f6: am 397c0f5a: Merge "Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes." into froyo
Merge commit 'afdc85f65d2952d3ec3be5e1ae2c4209938fc196' into gingerbread-plus-aosp

* commit 'afdc85f65d2952d3ec3be5e1ae2c4209938fc196':
  Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes.
2010-08-23 17:52:41 -07:00
Dirk Dougherty
afdc85f65d am 397c0f5a: Merge "Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes." into froyo
Merge commit '397c0f5a18281e3880b9359feab683a13d271a03' into gingerbread

* commit '397c0f5a18281e3880b9359feab683a13d271a03':
  Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes.
2010-08-23 17:49:49 -07:00
Dirk Dougherty
397c0f5a18 Merge "Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes." into froyo 2010-08-23 17:40:46 -07:00
Dirk Dougherty
1ba62882e4 Doc change: Add table to clarify launch modes and caution against using SingleTask and SingleInstance modes.
Change-Id: I9e04c54ed3e4d10afddedd6e6e35761e67652cd8
2010-08-23 17:38:35 -07:00
Jamie Gennis
8d920850c8 Merge "Add the setPreviewWindow camera HAL API to the camera stub." 2010-08-23 17:26:57 -07:00
Jamie Gennis
c8536d1952 Add the setPreviewWindow camera HAL API to the camera stub.
Change-Id: Ic669f9d5f5ae8f1fe5bd055f55aa4a18fa6d84cd
2010-08-23 17:25:55 -07:00
Jaikumar Ganesh
33696164ed Merge "Revert "Allow reliable detection of a message that is in use."" 2010-08-23 17:12:17 -07:00
Vasu Nori
cc6f54910d SQLiteOpenHelper should discard closed singleton database objects
bug:2943028
Change-Id: I4b6263cc25413995363158c976d3c723231cc050
2010-08-23 17:08:41 -07:00
Jaikumar Ganesh
ddb2bfeb6e Revert "Allow reliable detection of a message that is in use."
This reverts commit 6083d81ce4d67ec632962270fda64ebb9db0d5b1.
Reverting this because it causes runtime to reboot in a loop
if connected to a Bluetooth Headset.

copyFrom() needs to check for the introduced bit too.
2010-08-23 17:04:32 -07:00
Dianne Hackborn
b9fb1705e8 More watermark work.
Change-Id: I1d20bc1f8679a9750b247126436e8ef7e47a77be
2010-08-23 16:51:56 -07:00
Irfan Sheriff
9e6222f4c1 cache configured networks
Remove the sync-wait call into state machine for
fetching configured networks

Bug: b/2876746
Change-Id: I4434627abb78f7112fd613008c4c77374ac1b966
2010-08-23 16:32:24 -07:00
Irfan Sheriff
d9df0124de Merge "Clean up synchronous calls" 2010-08-23 16:11:42 -07:00
Irfan Sheriff
d8134ff9d8 Clean up synchronous calls
We dont plan to have asynchronous versions of the existing
synchronous calls since we have added more powerful
asynchronous calls. Remove functionality to check for
synchronous calls.

Also, remove unused sync call for fetching status

Change-Id: I2982cb7b2aabc88a63289d49686a6e3645085263
2010-08-23 15:50:39 -07:00
Gilles Debunne
b037da401a am 3e05a0be: Hysteresis effect in Text selection.
Merge commit '3e05a0beb2fad0b21558019d2adf6805da70e10e' into gingerbread-plus-aosp

* commit '3e05a0beb2fad0b21558019d2adf6805da70e10e':
  Hysteresis effect in Text selection.
2010-08-23 15:26:51 -07:00
Gilles Debunne
3e05a0beb2 Hysteresis effect in Text selection.
Vertical movement requires going over a given threshold to change line.
Makes it easier to move down without changing line, so that one can see the
cursor better. Also simplifies long line selection.

Change-Id: I791da500232c6e510af64c637ed994c5da9a4fea
2010-08-23 15:20:53 -07:00
Jamie Gennis
69d719662a Merge "Change the framework to use the new camera preview path." 2010-08-23 15:16:20 -07:00
Wink Saville
8da31dc8bf Merge "Allow reliable detection of a message that is in use." 2010-08-23 15:00:23 -07:00
Jamie Gennis
85cfdd0112 Change the framework to use the new camera preview path.
This change makes the camera HAL interface take an ANativeWindow interface from
which all the camera preview buffers will be allocated.  The framework code
running in application processes now passes a Surface object rather than an
ISurface to the camera server via Binder when setting the preview surface.  The
camera server then forwards that Surface object (which implements the
ANativeWindow interface) to the camera HAL, which uses it to communicate with
SurfaceFlinger to allocate the camera preview buffers.

Change-Id: Ie438f721559cd7de5e4f848a26d96360dda07b5f
2010-08-23 14:31:30 -07:00
Jean-Baptiste Queru
026231284c resolved conflicts for merge of 1ffd753e to gingerbread-plus-aosp
Change-Id: I2741766c359bed3040fa3b787d72483eb028fb6d
2010-08-23 14:20:47 -07:00
Jean-Baptiste Queru
360ab1dfb4 am 6864b3e2: Merge "Adds the ability to Android to initiate a 2 Digit Call."
Merge commit '6864b3e2f4e67be847b2ae054f2f9c388f115722' into gingerbread-plus-aosp

* commit '6864b3e2f4e67be847b2ae054f2f9c388f115722':
  Adds the ability to Android to initiate a 2 Digit Call.
2010-08-23 14:14:45 -07:00
Andreas Huber
7fdaa2329e Merge "Account for the _ADRENO constant being moved." 2010-08-23 14:08:02 -07:00
Jamie Gennis
c6c9b496aa Account for the _ADRENO constant being moved.
Change-Id: I443e2028c06f8b03e864525365c5c38de79314fe
2010-08-23 14:03:49 -07:00
Mathias Agopian
394c9bf659 am 0c76c7c5: Merge "add new sensor types for handling gyro data and device orientation more efficiently." into gingerbread
Merge commit '0c76c7c5eedf90b5fa1a95b6a9944b4e58747007' into gingerbread-plus-aosp

* commit '0c76c7c5eedf90b5fa1a95b6a9944b4e58747007':
  add new sensor types for handling gyro data and device orientation
2010-08-23 13:56:22 -07:00