OSDN Git Service
Robert Greenwalt [Fri, 26 Feb 2010 22:58:45 +0000 (14:58 -0800)]
Merge "Fix hipri status notifications"
Chris Tate [Fri, 26 Feb 2010 22:16:59 +0000 (14:16 -0800)]
Merge "Make sure to apply the auto-restore setting when the system is restored"
Romain Guy [Fri, 26 Feb 2010 22:15:42 +0000 (14:15 -0800)]
Merge "Do not detach headers and footers from the list view."
Fred Quintana [Fri, 26 Feb 2010 21:43:09 +0000 (13:43 -0800)]
Merge "remove redundant @hides"
Mike Lockwood [Fri, 26 Feb 2010 21:37:34 +0000 (13:37 -0800)]
Merge "CdmaDataConnectionTracker: Add DUN to list of supported APN types."
Marco Nelissen [Fri, 26 Feb 2010 21:30:27 +0000 (13:30 -0800)]
Merge "When we're in the 'playback complete' state, don't consider pausing an error. This makes 'playback complete' essentially equivalent to being paused at the end, and treats it the same as being paused at any other position."
Romain Guy [Fri, 26 Feb 2010 21:16:21 +0000 (13:16 -0800)]
Merge "Send cancel event to recycled views instead of an up. Bug #
2309387"
Chris Tate [Fri, 26 Feb 2010 21:06:42 +0000 (13:06 -0800)]
Merge "Add single-package restore to Bmgr feature set"
Vasu Nori [Fri, 26 Feb 2010 19:45:54 +0000 (11:45 -0800)]
Merge "in finalize() methods, log warnings if db lock is going to be held."
Gilles Debunne [Fri, 26 Feb 2010 19:37:40 +0000 (11:37 -0800)]
Merge "New tests for ExpandableListView to exercice packed position with headers/footers."
Andreas Huber [Fri, 26 Feb 2010 18:47:11 +0000 (10:47 -0800)]
Merge "The PV aac software decoder screws up if playing a mono-AACplus stream unless we output stereo data. Now we always output stereo data as the legacy OMX nodes did."
Marco Nelissen [Fri, 26 Feb 2010 18:46:46 +0000 (10:46 -0800)]
Merge "Make AsyncPlayer.startSound catch all exceptions instead of only a few. Two reasons for this: - it's used in the system process - it's run in a separate thread, so the user of AsyncPlayer cannot catch these exceptions"
Fred Quintana [Fri, 26 Feb 2010 17:50:18 +0000 (09:50 -0800)]
Merge "deprecate SyncConstValue, since it is now only used by the deprecated ContactsProvider interface"
Ben Murdoch [Fri, 26 Feb 2010 10:11:18 +0000 (02:11 -0800)]
Merge "Keep track of when the HTML5 database path has been set, so that we don't inadvertantly sync it to the native side before it has been set by the client."
Jim Miller [Fri, 26 Feb 2010 05:03:17 +0000 (21:03 -0800)]
Merge "Fix
2336057: Provide a way for the user to return to a call from LockScreen."
Jaikumar Ganesh [Fri, 26 Feb 2010 03:39:58 +0000 (19:39 -0800)]
Merge "Move auto pairing data to a file, add values dynamically."
Chris Tate [Fri, 26 Feb 2010 02:04:08 +0000 (18:04 -0800)]
Merge "Default the auto-restore setting to "enabled.""
Chris Tate [Fri, 26 Feb 2010 01:20:50 +0000 (17:20 -0800)]
Merge "Be sure to back up / restore some new settings"
Marc Blank [Fri, 26 Feb 2010 00:59:54 +0000 (16:59 -0800)]
Merge "Define the new lastSyncedAttendeeStatus column"
Chris Tate [Fri, 26 Feb 2010 00:52:08 +0000 (16:52 -0800)]
Merge "Start respecting the auto-restore-at-install setting"
Adam Powell [Fri, 26 Feb 2010 00:29:42 +0000 (16:29 -0800)]
Merge "HorizontalScrollView multitouch scroll and only grip on content AbsListView multitouch scroll and only grip on content"
Andreas Huber [Fri, 26 Feb 2010 00:25:43 +0000 (16:25 -0800)]
Merge "Support vendor MPEG4 test content with apparently malformed chunks in them."
Kenny Root [Thu, 25 Feb 2010 23:54:19 +0000 (15:54 -0800)]
Merge "Remove misleading method comment on TextView#setHint"
James Dong [Thu, 25 Feb 2010 23:14:40 +0000 (15:14 -0800)]
Merge "Add some space and total memory amount to the memory dump from the media server process."
James Dong [Thu, 25 Feb 2010 23:11:29 +0000 (15:11 -0800)]
Merge "Image encoding settings java API through xml configuration file"
The Android Open Source Project [Thu, 25 Feb 2010 23:08:03 +0000 (15:08 -0800)]
am
fc7028f1: merge from open-source master
Merge commit '
fc7028f1c68dcc8d59c8e4daf4a8917a3d9a7558'
* commit '
fc7028f1c68dcc8d59c8e4daf4a8917a3d9a7558':
Move LocationTracker test app from vendor/google to frameworks/base/tests
The Android Open Source Project [Thu, 25 Feb 2010 22:54:51 +0000 (14:54 -0800)]
merge from open-source master
Romain Guy [Thu, 25 Feb 2010 22:33:32 +0000 (14:33 -0800)]
Merge "Prevent ProgressBar from updating itself when hidden. Bug #
2470737"
Gilles Debunne [Thu, 25 Feb 2010 21:49:53 +0000 (13:49 -0800)]
Merge "New test on ContextMenuInfo packed positions."
Steve Howard [Thu, 25 Feb 2010 21:42:43 +0000 (13:42 -0800)]
Merge "Improve accelerometer-based orientation sensing."
Eric Fischer [Thu, 25 Feb 2010 20:18:55 +0000 (12:18 -0800)]
Merge "Add support for accessing native bidi implementation via jni."
Robert Greenwalt [Thu, 25 Feb 2010 20:18:26 +0000 (12:18 -0800)]
Merge "Fix no-mobile-data after wifi."
Oscar Montemayor [Thu, 25 Feb 2010 19:43:22 +0000 (11:43 -0800)]
Merge "Replacing hard-coded mount point for ASEC with a getenv() call."
Dianne Hackborn [Thu, 25 Feb 2010 03:54:22 +0000 (19:54 -0800)]
Re-arrange android-common so framework no longer links with it.
This is the framework part, moving classes around so the framework
no longer needs to link to android-common. Makes some APIs public,
others that didn't need to be public are private in the framework,
some small things are copied.
Amith Yamasani [Thu, 25 Feb 2010 19:13:21 +0000 (11:13 -0800)]
Merge "Configuration param to indicate if sd card is behind the battery."
Dianne Hackborn [Thu, 25 Feb 2010 19:10:55 +0000 (11:10 -0800)]
Merge "Init car mode when phone is booted in a dock."
Romain Guy [Thu, 25 Feb 2010 19:02:24 +0000 (11:02 -0800)]
Merge "Correctly handle negative margins in horizontal linear layouts."
Elliott Hughes [Thu, 25 Feb 2010 18:32:41 +0000 (10:32 -0800)]
Merge "Remove incorrect/misleading irrelevancies from example code."
Amith Yamasani [Thu, 25 Feb 2010 18:27:33 +0000 (10:27 -0800)]
Merge "Fix for voice search crash in maps and youtube. Bug
2453182"
Mike LeBeau [Thu, 25 Feb 2010 18:16:14 +0000 (10:16 -0800)]
Merge "Add the API constants to support providing hint strings in the response to RecognizerIntent.ACTION_GET_LANGUAGE_DETAILS."
Jean-Michel Trivi [Thu, 25 Feb 2010 16:47:40 +0000 (08:47 -0800)]
Merge "Fix bug
2452941 Add a flag to maintain the intended direct playback of TTS data independently from the associated AudioTrack state. Only start the track when it's been stopped but is supposed to be playing."
Mike LeBeau [Wed, 24 Feb 2010 22:08:18 +0000 (14:08 -0800)]
Add the API constants to support providing hint strings in the response to
RecognizerIntent.ACTION_GET_LANGUAGE_DETAILS.
This will use the new support for ArrayList<CharSequence> bundles added in
http://b/
2468093. This and the corresponding VoiceSearch CL should not be
submitted until that is.
Steve Block [Thu, 25 Feb 2010 11:17:36 +0000 (03:17 -0800)]
Merge "Add HTML5 layout tests that currently fail to the DumpRenderTree skipped list"
Eric Laurent [Thu, 25 Feb 2010 08:14:47 +0000 (00:14 -0800)]
Merge "Fix issue
2327064: Music played via line out is interrupted due to the phone call audio on BT hs."
Suchi Amalapurapu [Thu, 25 Feb 2010 04:43:24 +0000 (20:43 -0800)]
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."
Robert Greenwalt [Thu, 25 Feb 2010 03:45:32 +0000 (19:45 -0800)]
Merge "Add mobile data on/off switch."
Carl Shapiro [Thu, 25 Feb 2010 03:15:06 +0000 (19:15 -0800)]
Merge "Remove empty finalize methods."
San Mehat [Thu, 25 Feb 2010 03:04:48 +0000 (19:04 -0800)]
Merge "MountService: Send UMS_CONNECTED broadcast on boot if UMS connected."
Grace Kloba [Thu, 25 Feb 2010 02:56:27 +0000 (18:56 -0800)]
Romain Guy [Thu, 25 Feb 2010 02:55:59 +0000 (18:55 -0800)]
Merge "Fix tabs."
Grace Kloba [Thu, 25 Feb 2010 02:39:55 +0000 (18:39 -0800)]
Adam Powell [Thu, 25 Feb 2010 02:30:14 +0000 (18:30 -0800)]
Merge "ScrollView multiple pointer support. Fixed a bug where ScrollView wouldn't scroll if the initially tapped child ignores the down event."
Dmitri Plotnikov [Thu, 25 Feb 2010 02:26:40 +0000 (18:26 -0800)]
Merge "Introducing tentative (and hidden) API for contact search snippets"
Robert Greenwalt [Thu, 25 Feb 2010 02:07:18 +0000 (18:07 -0800)]
Merge "Tethering improvements."
San Mehat [Thu, 25 Feb 2010 02:06:01 +0000 (18:06 -0800)]
Merge "AsecTests: Add teardown to tests"
Romain Guy [Thu, 25 Feb 2010 02:00:01 +0000 (18:00 -0800)]
Merge "Fix the build."
Jesse Wilson [Thu, 25 Feb 2010 01:38:13 +0000 (17:38 -0800)]
Merge "New update of preloaded classes for Froyo."
Chris Tate [Thu, 25 Feb 2010 01:24:54 +0000 (17:24 -0800)]
Merge "Add 'restoreAnyVersion' attr for apps that want to restore "future" data"
Joe Onorato [Thu, 25 Feb 2010 00:30:00 +0000 (16:30 -0800)]
Merge "Make ScrollView only do overscroll if you're grabbing the child view."
Fred Quintana [Wed, 24 Feb 2010 23:25:44 +0000 (15:25 -0800)]
Merge "allow permission USE_CREDENTIALS for AccountManager.invalidateAuthToken as well as the previous MANAGE_ACCOUNTS"
Eric Fischer [Wed, 24 Feb 2010 22:53:10 +0000 (14:53 -0800)]
Merge "Filenames of sound effects are not translatable."
Vasu Nori [Wed, 24 Feb 2010 22:36:36 +0000 (14:36 -0800)]
Merge "yet another race condition fix to address bug:
2456970"
Grace Kloba [Wed, 24 Feb 2010 22:32:50 +0000 (14:32 -0800)]
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."
Andreas Huber [Wed, 24 Feb 2010 22:32:16 +0000 (14:32 -0800)]
Merge "Recover from a certain mp3 decoder error instead of signalling an error and thereby stopping decoding."
Kenny Root [Wed, 24 Feb 2010 22:14:13 +0000 (14:14 -0800)]
Merge "Fix spelling mistakes in attrs_manifest.xml"
Erik Pasternak [Wed, 24 Feb 2010 22:00:01 +0000 (14:00 -0800)]
Merge "b/
2441327 Added add account intent to public api."
Kenny Root [Wed, 24 Feb 2010 21:19:14 +0000 (13:19 -0800)]
Merge "Add some backup Javadoc and clean imports"
Fred Quintana [Wed, 24 Feb 2010 21:15:14 +0000 (13:15 -0800)]
Merge "- return the accounts when getAccountByTypeAndFeatures is passed a null or empty features set, b/issue?id=
2467165 - clear the authtokens when the password changes"
Leon Scroggins [Wed, 24 Feb 2010 20:17:35 +0000 (12:17 -0800)]
Merge "Focus the IME on WebView when no textfield is in focus."
Eric Laurent [Wed, 24 Feb 2010 19:51:43 +0000 (11:51 -0800)]
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.
Mike Lockwood [Wed, 24 Feb 2010 19:52:36 +0000 (11:52 -0800)]
Merge "GpsLocationProvider: Be less aggressive about getting fixes in bad conditions if we have a long fix interval."
Mike Lockwood [Wed, 24 Feb 2010 19:39:40 +0000 (11:39 -0800)]
Merge "Fix broken location extras in GpsLocationProvider."
Doug Zongker [Wed, 24 Feb 2010 19:38:08 +0000 (11:38 -0800)]
Merge "add "startservice" option to am command-line utility"
Nick Pelly [Wed, 24 Feb 2010 19:34:03 +0000 (11:34 -0800)]
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."
Suchi Amalapurapu [Wed, 24 Feb 2010 19:33:31 +0000 (11:33 -0800)]
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."
Eric Fischer [Wed, 24 Feb 2010 19:32:51 +0000 (11:32 -0800)]
Merge "Factor bidi algorithm into separate method."
The Android Open Source Project [Wed, 24 Feb 2010 19:19:12 +0000 (11:19 -0800)]
am
563d3a62: merge from open-source master
Merge commit '
563d3a62f3762b312a4c0a9d9af15a2333beaede'
* commit '
563d3a62f3762b312a4c0a9d9af15a2333beaede':
These changes add access to some status values in widgets listed below:
Xavier Ducrohet [Wed, 24 Feb 2010 18:54:00 +0000 (10:54 -0800)]
Merge "Fix the layoutlib to still support fill_parent."
Andy McFadden [Wed, 24 Feb 2010 18:15:34 +0000 (10:15 -0800)]
Merge "Fix build."
Romain Guy [Wed, 24 Feb 2010 18:02:58 +0000 (10:02 -0800)]
Merge "Add disabled state to the Spinner widget. Bug #
2464034"
The Android Open Source Project [Wed, 24 Feb 2010 18:02:55 +0000 (10:02 -0800)]
merge from open-source master
Mike Lockwood [Wed, 24 Feb 2010 18:00:51 +0000 (10:00 -0800)]
Merge "LocationTracker: change copyright from Google to AOSP."
San Mehat [Wed, 24 Feb 2010 17:52:55 +0000 (09:52 -0800)]
Merge "MountService: Fix bug which would allow apps to try to rename a container whos dst is mounted"
Andy McFadden [Wed, 24 Feb 2010 17:38:48 +0000 (09:38 -0800)]
Merge "Add class init stats to alloc counters (API change)."
Andreas Huber [Wed, 24 Feb 2010 17:12:03 +0000 (09:12 -0800)]
Merge "Tag stagefright development tools as "debug-only"."
The Android Open Source Project [Wed, 24 Feb 2010 17:11:10 +0000 (09:11 -0800)]
merge from open-source master
Grace Kloba [Wed, 24 Feb 2010 17:09:19 +0000 (09:09 -0800)]
Merge "Temp disable plugin's signature checking."
Kenny Root [Wed, 24 Feb 2010 15:52:27 +0000 (07:52 -0800)]
Merge "Use UTF-8 strings to avoid duplicate caching, part 1"
Daisuke Miyakawa [Wed, 24 Feb 2010 11:00:51 +0000 (03:00 -0800)]
Merge "Purge CallLog."
Bjorn Bringert [Wed, 24 Feb 2010 08:22:56 +0000 (00:22 -0800)]
Merge "Use PackageMonitor in SearchManagerService"
Eric Laurent [Wed, 24 Feb 2010 07:36:37 +0000 (23:36 -0800)]
Merge "Fix issue
2305382: Pick up original call makes a noisy beep when wired headset connected."
Romain Guy [Wed, 24 Feb 2010 06:23:21 +0000 (22:23 -0800)]
Merge "These changes add access to some status values in widgets listed below:"
Daniel Sandler [Wed, 24 Feb 2010 03:34:08 +0000 (19:34 -0800)]
Merge "Turn off lock screen sounds by default."
Joe Onorato [Wed, 24 Feb 2010 03:20:22 +0000 (19:20 -0800)]
Merge "Make the notification windowshade work properly with overscroll."
Brian Carlstrom [Wed, 24 Feb 2010 02:48:06 +0000 (18:48 -0800)]
Merge "javadoc spelling fix"
Roy West [Wed, 24 Feb 2010 02:09:19 +0000 (18:09 -0800)]
Merge "Edit strings related to calendar permissions, bug
2463956."
Robert Greenwalt [Wed, 24 Feb 2010 02:08:04 +0000 (18:08 -0800)]
Merge "Add USB RNDIS enable/disable control"
Fabrice Di Meglio [Wed, 24 Feb 2010 01:02:36 +0000 (17:02 -0800)]
Merge "Fix bug #
2449594 (device should fold RRULEs, etc., that are longer than 75 chars)"
Eric Fischer [Wed, 24 Feb 2010 00:45:41 +0000 (16:45 -0800)]
Merge "Fix rounding of extra spacing when it is negative."
Romain Guy [Wed, 24 Feb 2010 00:01:37 +0000 (16:01 -0800)]
Merge "Remove unused private assets from Android 1.0."