Commit Graph

12917 Commits

Author SHA1 Message Date
Eric Laurent
83db7782aa Merge "Fix issue 2327064: Music played via line out is interrupted due to the phone call audio on BT hs." 2010-02-25 00:14:47 -08:00
Suchi Amalapurapu
4c0c10cb7a Merge "Add new handler mechanism in MountService to make unmount api asynchronous. MountService updates state on PackageManager and then tries to kill processes holding file references to media about to be unmounted by invoking api on ACtivityManager. This is retried upto 4 times to make sure all processes holding file references are killed before unmounting the media at specified path." 2010-02-24 20:43:24 -08:00
Robert Greenwalt
83b9d9c8f5 Merge "Add mobile data on/off switch." 2010-02-24 19:45:32 -08:00
Carl Shapiro
2c0ba019e5 Merge "Remove empty finalize methods." 2010-02-24 19:15:06 -08:00
San Mehat
488259ec96 Merge "MountService: Send UMS_CONNECTED broadcast on boot if UMS connected." 2010-02-24 19:04:48 -08:00
Grace Kloba
59d23756a9 am cbe4f887: (-s ours) am a406fb90: DO NOT MERGE
Merge commit 'cbe4f88747b56a753e4a9bf061946f4c6f051243'

* commit 'cbe4f88747b56a753e4a9bf061946f4c6f051243':
  DO NOT MERGE
2010-02-24 18:56:27 -08:00
Romain Guy
daba8ec2eb Merge "Fix tabs." 2010-02-24 18:55:59 -08:00
Grace Kloba
926c85d6bb am a406fb90: DO NOT MERGE
Merge commit 'a406fb90805adf36fe0fabd3a79018e33706453c' into eclair-mr2-plus-aosp

* commit 'a406fb90805adf36fe0fabd3a79018e33706453c':
  DO NOT MERGE
2010-02-24 18:39:55 -08:00
Adam Powell
cd1f2949ca Merge "ScrollView multiple pointer support. Fixed a bug where ScrollView wouldn't scroll if the initially tapped child ignores the down event." 2010-02-24 18:30:14 -08:00
Dmitri Plotnikov
fe9649ffd7 Merge "Introducing tentative (and hidden) API for contact search snippets" 2010-02-24 18:26:40 -08:00
Robert Greenwalt
ed05d0371b Merge "Tethering improvements." 2010-02-24 18:07:18 -08:00
San Mehat
685ce0e49f Merge "AsecTests: Add teardown to tests" 2010-02-24 18:06:01 -08:00
Romain Guy
501eed376e Merge "Fix the build." 2010-02-24 18:00:01 -08:00
Jesse Wilson
36180e6461 Merge "New update of preloaded classes for Froyo." 2010-02-24 17:38:13 -08:00
Chris Tate
0418eeb3b0 Merge "Add 'restoreAnyVersion' attr for apps that want to restore "future" data" 2010-02-24 17:24:54 -08:00
Joe Onorato
775c5b3935 Merge "Make ScrollView only do overscroll if you're grabbing the child view." 2010-02-24 16:30:00 -08:00
Fred Quintana
ef6f2a9409 Merge "allow permission USE_CREDENTIALS for AccountManager.invalidateAuthToken as well as the previous MANAGE_ACCOUNTS" 2010-02-24 15:25:44 -08:00
Eric Fischer
9963d1531a Merge "Filenames of sound effects are not translatable." 2010-02-24 14:53:10 -08:00
Vasu Nori
297ac17573 Merge "yet another race condition fix to address bug:2456970" 2010-02-24 14:36:36 -08:00
Grace Kloba
66f322746a Merge "If mPreventDrag is cancelled due to time out, remove the pending TOUCH_EVENTS and then send an ACTION_CANCEL and skip the rest of touch events." 2010-02-24 14:32:50 -08:00
Andreas Huber
3a8d9a0237 Merge "Recover from a certain mp3 decoder error instead of signalling an error and thereby stopping decoding." 2010-02-24 14:32:16 -08:00
Kenny Root
e41de7db43 Merge "Fix spelling mistakes in attrs_manifest.xml" 2010-02-24 14:14:13 -08:00
Erik Pasternak
62ef31127e Merge "b/2441327 Added add account intent to public api." 2010-02-24 14:00:01 -08:00
Kenny Root
587006a94a Merge "Add some backup Javadoc and clean imports" 2010-02-24 13:19:14 -08:00
Fred Quintana
eef62659e3 Merge "- return the accounts when getAccountByTypeAndFeatures is passed a null or empty features set, http://b/issue?id=2467165 - clear the authtokens when the password changes" 2010-02-24 13:15:14 -08:00
Leon Scroggins
ed05d34bf7 Merge "Focus the IME on WebView when no textfield is in focus." 2010-02-24 12:17:35 -08:00
Eric Laurent
15498d6a23 Fix issue 2327064: Music played via line out is interrupted due to the phone call audio on BT hs.
This is not a real fix for the issue but a change to make sure that the behavior is consistent regardless of
external condidions (WIFI ON or OFF, music started before call or not, A2DP device same as SCO device...).

As there is now way to guaranty good quality audio over both SCO and A2DP simultaneously, especially when WIFI is on, We will stick to this behavior:
When music is playing and we are docked to the desk dock and a call is answered with a BT SCO headset, A2DP output will be suspended.
If music is restarted during the call, it will appear muted to the user until the call is terminated.
2010-02-24 11:54:32 -08:00
Mike Lockwood
015896f115 Merge "GpsLocationProvider: Be less aggressive about getting fixes in bad conditions if we have a long fix interval." 2010-02-24 11:52:36 -08:00
Mike Lockwood
85f6095c75 Merge "Fix broken location extras in GpsLocationProvider." 2010-02-24 11:39:40 -08:00
Doug Zongker
956e9d0cf4 Merge "add "startservice" option to am command-line utility" 2010-02-24 11:38:08 -08:00
Nick Pelly
cbeca11a9c Merge "Add documentation to help developers make an RFCOMM conection to a Bluetooth serial board. They all use a well-known UUID that is not really explained anywhere official, and this always trips developers up." 2010-02-24 11:34:03 -08:00
Suchi Amalapurapu
20cc9f575a Merge "Some framework fixes for apps on sd change hard coded path in installd fix tests Work around for renaming containers. Do forced unmount when destroying containers. Force a gc in default container service to release handle to parsed package and thus avoid getting killed by vold Some cosmetic changes to PackageManager api. Unit tests for renaming container for MountService Remove internal size limit on app to be installed." 2010-02-24 11:33:31 -08:00
Eric Fischer
2cfb73afe5 Merge "Factor bidi algorithm into separate method." 2010-02-24 11:32:51 -08:00
The Android Open Source Project
4c33834b4c am 563d3a62: merge from open-source master
Merge commit '563d3a62f3762b312a4c0a9d9af15a2333beaede'

* commit '563d3a62f3762b312a4c0a9d9af15a2333beaede':
  These changes add access to some status values in widgets listed below:
2010-02-24 11:19:12 -08:00
Xavier Ducrohet
30d83ec9cb Merge "Fix the layoutlib to still support fill_parent." 2010-02-24 10:54:00 -08:00
Andy McFadden
ad398022f0 Merge "Fix build." 2010-02-24 10:15:34 -08:00
Romain Guy
c2c820da4a Merge "Add disabled state to the Spinner widget. Bug #2464034" 2010-02-24 10:02:58 -08:00
The Android Open Source Project
4971d0b540 merge from open-source master 2010-02-24 10:02:55 -08:00
Mike Lockwood
fc69801d50 Merge "LocationTracker: change copyright from Google to AOSP." 2010-02-24 10:00:51 -08:00
San Mehat
c7403a1dc1 Merge "MountService: Fix bug which would allow apps to try to rename a container whos dst is mounted" 2010-02-24 09:52:55 -08:00
Andy McFadden
a8a2fd75c3 Merge "Add class init stats to alloc counters (API change)." 2010-02-24 09:38:48 -08:00
Andreas Huber
c5ffe243e7 Merge "Tag stagefright development tools as "debug-only"." 2010-02-24 09:12:03 -08:00
The Android Open Source Project
b206c77531 merge from open-source master 2010-02-24 09:11:10 -08:00
Grace Kloba
9963294534 Merge "Temp disable plugin's signature checking." 2010-02-24 09:09:19 -08:00
Kenny Root
f70c4cebcc Merge "Use UTF-8 strings to avoid duplicate caching, part 1" 2010-02-24 07:52:27 -08:00
Daisuke Miyakawa
30c205b6ea Merge "Purge CallLog." 2010-02-24 03:00:51 -08:00
Bjorn Bringert
11213f6ff0 Merge "Use PackageMonitor in SearchManagerService" 2010-02-24 00:22:56 -08:00
Eric Laurent
057aa729dd Merge "Fix issue 2305382: Pick up original call makes a noisy beep when wired headset connected." 2010-02-23 23:36:37 -08:00
Romain Guy
53342df095 Merge "These changes add access to some status values in widgets listed below:" 2010-02-23 22:23:21 -08:00
Daniel Sandler
4dffa10031 Merge "Turn off lock screen sounds by default." 2010-02-23 19:34:08 -08:00