OSDN Git Service
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."
James Dong [Tue, 23 Feb 2010 23:42:28 +0000 (15:42 -0800)]
Merge "Use Java API from xml configuration in the test application"
Dmitry Shmidt [Tue, 23 Feb 2010 23:25:46 +0000 (15:25 -0800)]
Merge "Add Arp Cache dump"
Joe Onorato [Tue, 23 Feb 2010 23:09:49 +0000 (15:09 -0800)]
Merge "Remove never-used dead code from BackupManager"
Jim Miller [Tue, 23 Feb 2010 22:16:46 +0000 (14:16 -0800)]
Merge "Fix
2463886: Allow delayed fetching of DevicePolicyManager in LockPatternUtils."
Mathias Agopian [Tue, 23 Feb 2010 20:52:28 +0000 (12:52 -0800)]
Merge "remove a dependency of surfaceflinger on libskia"
Doug Zongker [Tue, 23 Feb 2010 20:37:53 +0000 (12:37 -0800)]
Merge "fix error in javadoc"
Adam Powell [Tue, 23 Feb 2010 20:09:07 +0000 (12:09 -0800)]
Merge "Fixing pressed state in preferences, addresses bug
2310741"
Dan Egnor [Tue, 23 Feb 2010 19:57:13 +0000 (11:57 -0800)]
Merge "Update AccountManager's javadoc."
Eric Laurent [Tue, 23 Feb 2010 17:48:31 +0000 (09:48 -0800)]
Fix issue
2305382: Pick up original call makes a noisy beep when wired headset connected.
The noise is the residual ring tone that is still playing while the call is answered and the
audio route changed to headset or earpiece.
The fix consists in muting the ringing tone when changing mode from ringtone to in call
and delaying the route change until the audio buffers are emptied.
Brett Chabot [Tue, 23 Feb 2010 18:46:42 +0000 (10:46 -0800)]
Merge "Add ability to run tests restricted to given annotation."
Mike Lockwood [Tue, 23 Feb 2010 18:34:52 +0000 (10:34 -0800)]
Merge "Move LocationTracker from com.google.android to com.android package."
Andreas Huber [Tue, 23 Feb 2010 18:30:48 +0000 (10:30 -0800)]
Merge "Return runtime errors instead of asserting in MPEG4 file format validation, also add more validation to ensure presence of codec specific data for avc, aac and mpeg4."
James Dong [Tue, 23 Feb 2010 18:16:57 +0000 (10:16 -0800)]
Merge "Replace system property retrieval calls with DecoderCapabilities Java API calls."
Kenny Root [Tue, 23 Feb 2010 06:36:26 +0000 (22:36 -0800)]
Use UTF-8 strings to avoid duplicate caching, part 1
StringBlock instances containing UTF-8 strings use a cache to convert
into UTF-16, but using that cache and then using a JNI call to NewString
causes the UTF-8 string as well as two copies of the UTF-16 string to
be held in memory. Getting the UTF-8 string directly from the StringPool
eliminates one copy of the UTF-16 string being held in memory.
This is part 1. Part 2 will include ResXMLParser optimizations.
Change-Id: Ibd4509a485db746d59cd4b9501f544877139276c
Bjorn Bringert [Tue, 23 Feb 2010 14:28:31 +0000 (06:28 -0800)]
Merge "Clean up global search and web search activity finding"
Mike Lockwood [Tue, 23 Feb 2010 04:58:43 +0000 (20:58 -0800)]
Merge "Move LocationTracker test app from vendor/google to frameworks/base/tests"
Dianne Hackborn [Tue, 23 Feb 2010 04:48:01 +0000 (20:48 -0800)]
Merge "Fix some random bugs."
Mike Lockwood [Tue, 23 Feb 2010 04:39:24 +0000 (20:39 -0800)]
Merge "Don't start location providers until the system is ready."
Oscar Montemayor [Tue, 23 Feb 2010 02:16:32 +0000 (18:16 -0800)]
Merge "Fix bug when adding SET_INSTALL_LOCATION to SettingsProvider database, upgrade path."
Guang Zhu [Tue, 23 Feb 2010 01:50:31 +0000 (17:50 -0800)]
Merge "Quick fix layout test path problems"
Mathias Agopian [Mon, 22 Feb 2010 11:15:57 +0000 (03:15 -0800)]
remove a dependency of surfaceflinger on libskia
libskia was only used for a small part of SkTransform. We now implement
Transform is surfaceflinger directly.
Jason Sams [Tue, 23 Feb 2010 01:06:21 +0000 (17:06 -0800)]
Merge "beging np2 extension check work."
Romain Guy [Tue, 23 Feb 2010 01:01:41 +0000 (17:01 -0800)]
Merge "Calling super.finalize() in finalize() methods. Also cleanup code, mostly removing unused handlers and casts."
Romain Guy [Tue, 23 Feb 2010 01:01:26 +0000 (17:01 -0800)]
Merge "Prevent crash in AbsSpinner when the selection is out of sync. Bug #196253"
Daniel Sandler [Tue, 23 Feb 2010 00:46:08 +0000 (16:46 -0800)]
Merge "Show the USB mass storage UI as soon as USB is connected."
Adam Powell [Tue, 23 Feb 2010 00:36:38 +0000 (16:36 -0800)]
Merge "Standard alert dialogs overscroll only when content scrolls"
Andreas Huber [Tue, 23 Feb 2010 00:34:32 +0000 (16:34 -0800)]
Merge "Properly unload the renderer shared library after the renderer goes away."
Brad Fitzpatrick [Tue, 23 Feb 2010 00:32:25 +0000 (16:32 -0800)]
Merge "Reduce SQLiteDatabase and ContentResolver EventLog logging thresholds."
Gloria Wang [Tue, 23 Feb 2010 00:08:28 +0000 (16:08 -0800)]
Merge "Fix for the safty check. It checks that nFir21 + jNpoints <= BUF_SIZE, but when it calls GetByteArrayRegion, it multiplies it by 2 which defeats the "// safety first" check at the beginning."
Andreas Huber [Mon, 22 Feb 2010 23:32:14 +0000 (15:32 -0800)]
Merge "This hardware video decoder lies about its required input buffer sizes allocating 2.7 MB of memory instead of the required 176 KB... Added another quirk."
Mathias Agopian [Mon, 22 Feb 2010 22:39:55 +0000 (14:39 -0800)]
Merge "remove a dependency of GraphicBuffer (libui) on Parcel (libbinder)."
Romain Guy [Mon, 22 Feb 2010 22:17:52 +0000 (14:17 -0800)]
Merge "Fix bug where calling getButton(int) returns null."
Oscar Montemayor [Mon, 22 Feb 2010 22:15:00 +0000 (14:15 -0800)]
Merge "Better file permissions enforcement on system keystore."
Adam Powell [Mon, 22 Feb 2010 22:14:46 +0000 (14:14 -0800)]
Merge "Don't switch layout modes in AbsListView#onTouchModeChanged() Don't stomp mResurrectToPosition for LAYOUT_SPECIFIC in AbsListView#hideSelector()"
San Mehat [Mon, 22 Feb 2010 21:21:58 +0000 (13:21 -0800)]
Merge "MountService: Force unmount when enabling ums"
Vasu Nori [Mon, 22 Feb 2010 20:58:44 +0000 (12:58 -0800)]
Merge "fix race condition introduced by CL https://android-git.corp.google.com/g/40395"
Dianne Hackborn [Mon, 22 Feb 2010 20:57:41 +0000 (12:57 -0800)]
Merge "Fix missing UI_MODE_SERVICE rename."
Bjorn Bringert [Mon, 22 Feb 2010 20:57:13 +0000 (12:57 -0800)]
Merge "Don't start global search from system dialogs"
Dianne Hackborn [Mon, 22 Feb 2010 20:18:01 +0000 (12:18 -0800)]
Merge "Fix issue #
2438980: Implement package watcher for voice recognizer service setting"