OSDN Git Service
Andreas Huber [Wed, 17 Mar 2010 19:53:22 +0000 (12:53 -0700)]
Merge "Instead of asserting that nothing bad happened during (software-)AAC decoding, return a runtime error if appropriate."
Romain Guy [Wed, 17 Mar 2010 19:45:39 +0000 (12:45 -0700)]
Merge "Fix centering in FrameLayout when margins are specified."
Scott Main [Wed, 17 Mar 2010 18:43:01 +0000 (11:43 -0700)]
Merge "docs: add Search dev guide new docs: Search (topic home page) Using the Android Search Box Adding Recent Query Suggestions Adding Custom Suggestions Searchable Configuration"
Romain Guy [Wed, 17 Mar 2010 18:10:07 +0000 (11:10 -0700)]
Merge "Fix NPE in AutoCompleteTextView to tame the monkeys. Bug #
2522599"
Steve Block [Wed, 17 Mar 2010 18:02:13 +0000 (11:02 -0700)]
Merge "Updates the status of some HTML5 storage layout tests in the DumpRenderTree skipped list"
San Mehat [Wed, 17 Mar 2010 17:56:29 +0000 (10:56 -0700)]
Merge "dumpstate: Remove df from bugreport and add vold system dump"
Dmitri Plotnikov [Wed, 17 Mar 2010 17:56:02 +0000 (10:56 -0700)]
Merge "Disable the HanziToPinyinTest when there is no Chinese collator."
Daniel Sandler [Wed, 17 Mar 2010 17:53:11 +0000 (10:53 -0700)]
Merge "Add progress indicator to USB mass storage screen."
Eric Laurent [Wed, 17 Mar 2010 16:16:27 +0000 (09:16 -0700)]
Merge "Fix issue
2416481: Support Voice Dialer over BT SCO."
Leon Scroggins [Wed, 17 Mar 2010 14:20:37 +0000 (07:20 -0700)]
Merge "Allow the shift key to be passed to plugin."
Chia-chi Yeh [Wed, 17 Mar 2010 08:48:30 +0000 (01:48 -0700)]
Merge "keystore: rephrase the comment to make the usage more clear."
Chia-chi Yeh [Wed, 17 Mar 2010 08:31:20 +0000 (16:31 +0800)]
keystore: rephrase the comment to make the usage more clear.
Change-Id: I529ca7ed443060089c95fe96dd230288be4b6c96
Mathias Agopian [Tue, 16 Mar 2010 23:41:46 +0000 (16:41 -0700)]
fix [
2511580] Window poop on screen - drop down list left some residual when it resized
Change-Id: Ib9a3622e7a568ba26717a93b5bfa4a191651f4d0
Eric Laurent [Thu, 11 Mar 2010 22:47:00 +0000 (14:47 -0800)]
Fix issue
2416481: Support Voice Dialer over BT SCO.
- AudioPolicyManager: allow platform specific choice for opening a direct output.
Also fixed problems in direct output management.
- AudioFliinger: use shorter standby delay and track inactivity grace period for direct output
thread to free hardware resources as soon as possible.
- AudioSystem: do not use cached output selection in getOutput() when a direct output
can be selected.
Change-Id: If44b50d29237b8402ffd7a5ba1dc43c56f903e9b
Fred Quintana [Tue, 16 Mar 2010 23:13:13 +0000 (16:13 -0700)]
Merge "Clean the settings for the account/authority when trying to sync an adapter that is not installed."
Steve Block [Tue, 16 Mar 2010 22:42:14 +0000 (15:42 -0700)]
Merge "Fix loading from the cache for synchronous requests"
Jason Sams [Tue, 16 Mar 2010 22:41:08 +0000 (15:41 -0700)]
Merge "First cut of basic RS headers for ScriptC. Not nearly complete."
Daisuke Miyakawa [Tue, 16 Mar 2010 22:04:13 +0000 (15:04 -0700)]
Merge "Make JNI function for setLocale() call register_localized_collators() with the current locale, not previous one, every time it is possible."
Marco Nelissen [Tue, 16 Mar 2010 21:46:22 +0000 (14:46 -0700)]
Merge ""isPlaying" should never block, acquiring the mutex here is unnecessary, rather than investing in a separate mutex guarding just "mFlags" we accept returning "true" from isPlaying one too many times."
Joe Onorato [Tue, 16 Mar 2010 21:45:36 +0000 (14:45 -0700)]
Merge "fix typos in docs"
Andreas Huber [Tue, 16 Mar 2010 21:43:57 +0000 (14:43 -0700)]
Merge "Properly use a long long literal to avoid under/overflow during fps computation."
Derek Sollenberger [Tue, 16 Mar 2010 20:53:34 +0000 (13:53 -0700)]
Merge "Plugin surfaces will be limited to 270% of the devices screen size."
Romain Guy [Tue, 16 Mar 2010 20:50:32 +0000 (13:50 -0700)]
Merge "Resize AutoCompleteTextView's dropdown when the list content changes. Bug #
2517711"
Vasu Nori [Tue, 16 Mar 2010 20:33:29 +0000 (13:33 -0700)]
Merge "close() database should close the db no matter what the ref count says"
Daniel Sandler [Tue, 16 Mar 2010 20:16:15 +0000 (13:16 -0700)]
Merge "Move MountService's Handler to a different thread."
Jack Palevich [Tue, 16 Mar 2010 20:00:30 +0000 (13:00 -0700)]
Merge "Implement eglInitialize / eglTerminate reference counting"
Andreas Huber [Tue, 16 Mar 2010 19:59:42 +0000 (12:59 -0700)]
Merge "Properly handle errors during the codec configuration phase, attempt to revert to next available (likely software-) codec if configuration fails."
Brett Chabot [Tue, 16 Mar 2010 19:44:03 +0000 (12:44 -0700)]
Merge "Remove flaky test MemoryFileTest:testPurge from large suite."
Vasu Nori [Tue, 16 Mar 2010 19:29:19 +0000 (12:29 -0700)]
Merge "fix the way last insert rowid is returned"
Derek Sollenberger [Tue, 16 Mar 2010 19:01:08 +0000 (12:01 -0700)]
Merge "Restrict plugins to a fixed size surface after exceeding a pixel threshold."
Bjorn Bringert [Tue, 16 Mar 2010 19:00:25 +0000 (12:00 -0700)]
Merge "Set SOURCE to app package name when starting QSB (if not set)"
Romain Guy [Tue, 16 Mar 2010 18:41:34 +0000 (11:41 -0700)]
Merge "Dismiss a dialog if dimissed right after calling show(). Bug #
2508607"
Jaikumar Ganesh [Tue, 16 Mar 2010 17:05:32 +0000 (10:05 -0700)]
Merge "Add ABORT support to Obex lib"
Fred Quintana [Tue, 16 Mar 2010 17:02:51 +0000 (10:02 -0700)]
Merge "- make the SyncManager add periodic syncs when it upgrades from a version of the accounts.xml file that pre-dated periodic syncs, e.g. eclair or early froyo. b/
2515823 - make the AccountManagerService dump() use a getAccounts call that doesn't check the GET_ACCOUNTS permission to make it useful in "adb bugreport" - add some logging to SyncManager to help track down a problem"
Glenn Kasten [Tue, 16 Mar 2010 16:39:50 +0000 (09:39 -0700)]
Merge "Fixes bug
2502132, and masks bug
2518313."
Kenny Root [Tue, 16 Mar 2010 16:20:00 +0000 (09:20 -0700)]
Merge "Fix regression in directory scanning"
Andreas Huber [Tue, 16 Mar 2010 16:11:44 +0000 (09:11 -0700)]
Merge "HTTPDataSource must be connected before it is usable. Fix this in the stagefright tool."
Kenny Root [Tue, 16 Mar 2010 16:03:56 +0000 (09:03 -0700)]
Merge "Adjust expected text frame length in ID3"
Mathias Agopian [Tue, 16 Mar 2010 04:36:10 +0000 (21:36 -0700)]
Merge "fix [
2515291] Native crash and runtime restart while trying to preview captured picture on Sapphire"
Jack Palevich [Tue, 16 Mar 2010 03:45:21 +0000 (20:45 -0700)]
Implement eglInitialize / eglTerminate reference counting
Previously we imlpemented the standard semantics for
eglInitialize / eglTerminate, which are that
eglInitialize may be called any number of times,
but the first call to eglTerminate will terminate
the display.
Now we follow reference-countins semantics, which
means that eglTerminate will only terminate the
display when the reference count returns to zero.
This change allows EGL to be used by multiple
independently written modules in the same process.
(Otherwise there is no way for the independent
modules to coordinate their use of the display.)
Adam Powell [Tue, 16 Mar 2010 01:27:38 +0000 (18:27 -0700)]
Merge "Fix monkey bug
2512055"
Mathias Agopian [Tue, 16 Mar 2010 01:15:20 +0000 (18:15 -0700)]
fix [
2515291] Native crash and runtime restart while trying to preview captured picture on Sapphire
if a buffer couldn't be allocated because of an OOM, SF could, in some case dereference
a null pointer.
Change-Id: I5321248c38a21e56d5278b6aada2694e64451378
Romain Guy [Tue, 16 Mar 2010 00:55:07 +0000 (17:55 -0700)]
Merge "Round up ImageView translations to avoid nasty surprises. Bug #
2499812"
Jeff Sharkey [Tue, 16 Mar 2010 00:19:50 +0000 (17:19 -0700)]
Merge "Switch SelectionBuilder to accept Object[], fix NPE."
Romain Guy [Tue, 16 Mar 2010 00:19:34 +0000 (17:19 -0700)]
Merge "Correctly handle disabled list items in AutoCompleteTextView. Bug #
2516659"
Robert Greenwalt [Tue, 16 Mar 2010 00:06:44 +0000 (17:06 -0700)]
Merge "Update the tethering icons."
Adam Powell [Mon, 15 Mar 2010 23:48:04 +0000 (16:48 -0700)]
Jack Palevich [Mon, 15 Mar 2010 23:35:37 +0000 (16:35 -0700)]
Merge "Improve eglSwapBuffers error handling."
Dmitri Plotnikov [Mon, 15 Mar 2010 23:21:32 +0000 (16:21 -0700)]
Merge "Removed compatibility function (was left in before to not break the build) Bug:
2501468"
Jean-Michel Trivi [Mon, 15 Mar 2010 22:42:57 +0000 (15:42 -0700)]
Merge "Revert TTS output filter tuning after reverting the Pico 1.1.0.2 energy distribution change in an attempt to fix bug
2449814."
jsh [Mon, 15 Mar 2010 22:35:27 +0000 (15:35 -0700)]
Merge "Add definitions for WiMAX and iDen network types."
Jim Miller [Mon, 15 Mar 2010 22:33:37 +0000 (15:33 -0700)]
Merge "Fix
2428368: Fix most of the lockscreen orientation refresh bugs"
Carl Shapiro [Mon, 15 Mar 2010 22:21:33 +0000 (15:21 -0700)]
Merge "Replace all uses of bzero with memset. Bzero and memset are both compiler built-ins so this change should not negatively effect the generated code. However, a forthcoming commit will remove the implicit include of strings.h from stdlib.h and bzero will no longer be visible in these translation units without additional includes."
Jean-Michel Trivi [Mon, 15 Mar 2010 21:18:57 +0000 (14:18 -0700)]
Merge "Fix bug
2203203 Route STREAM_VOICE_CALL to A2DP when not in call."
Adam Powell [Mon, 15 Mar 2010 21:14:13 +0000 (14:14 -0700)]
Merge "Fix bugs when transitioning out of touch mode"
Steve Howard [Mon, 15 Mar 2010 20:40:53 +0000 (13:40 -0700)]
Merge "Add a name to the previously-unnamed thread created by SoundPoolThread."
Brad Fitzpatrick [Mon, 15 Mar 2010 20:02:44 +0000 (13:02 -0700)]
Merge "Allocate SQLiteQueryBuilder's WHERE clause StringBuilder lazily."
Andreas Huber [Mon, 15 Mar 2010 17:38:16 +0000 (10:38 -0700)]
Merge "Hack to "support" "enhanced" podcasts... slang for malformed .mp4 files."
Andreas Huber [Mon, 15 Mar 2010 17:38:00 +0000 (10:38 -0700)]
Merge "Fix the media metadata retriever (tests). The native constants must match those published at the java layer."
Andreas Huber [Mon, 15 Mar 2010 17:37:34 +0000 (10:37 -0700)]
Merge "Tag the "testid3" commandline tool as "debug-only". It doesn't need to be included in release builds."
Derek Sollenberger [Mon, 15 Mar 2010 17:32:25 +0000 (10:32 -0700)]
Merge "Allow plugin's surface to handle touch when in full-screen."
Leon Scroggins [Mon, 15 Mar 2010 17:24:02 +0000 (10:24 -0700)]
Merge "Call close on Cursors in finally blocks."
Dianne Hackborn [Mon, 15 Mar 2010 14:26:26 +0000 (07:26 -0700)]
Merge "Fix issue
2512221: Car Dock Notification doesn't go away"
Mike Reed [Mon, 15 Mar 2010 12:03:41 +0000 (05:03 -0700)]
Merge "misc fixes, including 0xB0B8"
Jean-Michel Trivi [Sat, 13 Mar 2010 20:33:15 +0000 (12:33 -0800)]
Fix bug
2203203 Route STREAM_VOICE_CALL to A2DP when not in call.
Change-Id: I5581702780308658415dc4ad19fbe409fdc5c368
Amith Yamasani [Sun, 14 Mar 2010 15:00:22 +0000 (08:00 -0700)]
Merge "Use a Go button instead of a magnifying glass in the keyboard for in-app search."
Christopher Tate [Sat, 13 Mar 2010 02:34:53 +0000 (18:34 -0800)]
Merge "API CHANGE: expose the backup-related ApplicationInfo flag masks"
Jack Palevich [Sat, 13 Mar 2010 01:11:34 +0000 (17:11 -0800)]
Fix glCopyTexSubImage2D inverted texture bug.
This bug only affects the software OpenGL ES
driver.
Dianne Hackborn [Sat, 13 Mar 2010 01:07:48 +0000 (17:07 -0800)]
Merge "resolved conflicts for merge of
2ecce34f to master"
Elliott Hughes [Sat, 13 Mar 2010 00:52:58 +0000 (16:52 -0800)]
Merge "Replace the outdated table with links to the benchmarks."
Wink Saville [Sat, 13 Mar 2010 00:51:21 +0000 (16:51 -0800)]
Merge "Fix data error handling."
Dianne Hackborn [Sat, 13 Mar 2010 00:46:46 +0000 (16:46 -0800)]
resolved conflicts for merge of
2ecce34f to master
Change-Id: Ic4e38199beaf8c16f9d28ac5296e8aaa61788b36
Eric Fischer [Sat, 13 Mar 2010 00:43:07 +0000 (16:43 -0800)]
Merge "Add documentation for LeadingMarginSpan2."
Nicolas Catania [Fri, 12 Mar 2010 23:55:51 +0000 (15:55 -0800)]
Merge "ListActivity.onDestroy, remove any pending callbacks."
Adam Powell [Fri, 12 Mar 2010 22:58:32 +0000 (14:58 -0800)]
Merge "Make sure visible View state is updated before dispatching clicks"
Ken Shirriff [Fri, 12 Mar 2010 22:52:24 +0000 (14:52 -0800)]
Merge "Make sure Browser cursors are closed"
Andreas Huber [Fri, 12 Mar 2010 22:40:29 +0000 (14:40 -0800)]
Merge "Boost OMX callback dispatcher thread priority to prevent audio playback stuttering under increased system load"
Kenny Root [Fri, 12 Mar 2010 22:16:56 +0000 (14:16 -0800)]
Merge "Give an 9-patch error on too many rows and columns"
Adam Powell [Fri, 12 Mar 2010 22:11:46 +0000 (14:11 -0800)]
Merge "Improvements to ScaleGestureDetector"
Grace Kloba [Fri, 12 Mar 2010 21:58:03 +0000 (13:58 -0800)]
Merge "Expose smart-zoom, or centerFitRect to native."
Yu Shan Emily Lau [Fri, 12 Mar 2010 20:09:52 +0000 (12:09 -0800)]
Merge "Fix the bug that it should write the zero diff to the output file when the actual diff is negative."
Yu Shan Emily Lau [Fri, 12 Mar 2010 19:10:56 +0000 (11:10 -0800)]
Merge "Update the new activity name."
Kenny Root [Fri, 12 Mar 2010 19:04:13 +0000 (11:04 -0800)]
Merge "Add missing licensing headers for test classes"
Dianne Hackborn [Fri, 12 Mar 2010 18:54:44 +0000 (10:54 -0800)]
Merge "Fix: Retrieval of location to caclulate twilight"
Andreas Huber [Fri, 12 Mar 2010 17:39:33 +0000 (09:39 -0800)]
Merge "HTTPStream and HTTPDataSource now support cancellation of the connection process, AwesomePlayer takes advantage of this in cases where ::reset() or ::suspend() is called while in the preparation phase to bail out early. Also fixes in issue where the audio codec was not properly stopped if no audio player object ever took ownership."
Grace Kloba [Fri, 12 Mar 2010 17:38:49 +0000 (09:38 -0800)]
Merge "If we can't over scroll horizontally, set vx to 0 in doFling. Otherwise if vx is greater than vy, as we pin x later in onOverscrolled(), the fling doesn't work as expected."
Mike Lockwood [Fri, 12 Mar 2010 17:37:44 +0000 (09:37 -0800)]
Merge "Fix problems with new PowerManager.reboot() implementation."
Wink Saville [Fri, 12 Mar 2010 17:35:43 +0000 (09:35 -0800)]
Merge "Make sure that pause dialing works even when screen is off."
Steve Block [Fri, 12 Mar 2010 17:35:37 +0000 (09:35 -0800)]
Merge "Puts two regex layout tests back on the DumpRenderTree skipped list"
Grace Kloba [Fri, 12 Mar 2010 17:13:01 +0000 (09:13 -0800)]
Merge "If the Picture is not ready, just draw the background and return. This should help to avoid the flash in gm."
Wink Saville [Fri, 12 Mar 2010 17:10:44 +0000 (09:10 -0800)]
Merge "Add Copyright assignement."
Kenny Root [Fri, 12 Mar 2010 16:55:42 +0000 (08:55 -0800)]
Merge "Add missing license notices to files"
Dan Egnor [Fri, 12 Mar 2010 16:50:12 +0000 (08:50 -0800)]
Merge "Dump the phone process stack (as well as the system process) on watchdog reset."
Amith Yamasani [Fri, 12 Mar 2010 14:47:00 +0000 (06:47 -0800)]
Merge "Fix for
2175289 : Can't get keyboard in search dialog after switching to landscape"
Mike Lockwood [Fri, 12 Mar 2010 13:30:35 +0000 (05:30 -0800)]
Merge "Fix LocationManager.getProvider() API breakage."
Dianne Hackborn [Fri, 12 Mar 2010 05:44:48 +0000 (21:44 -0800)]
Merge "The return of rawbu. For other nefarious purposes."
Kenny Root [Fri, 12 Mar 2010 05:23:51 +0000 (21:23 -0800)]
Merge "Add correct copyright headers to multiple files"
Marc Blank [Fri, 12 Mar 2010 04:32:26 +0000 (20:32 -0800)]
Merge "Add ORGANIZER_CAN_RESPOND to Calendars column"
Adam Powell [Fri, 12 Mar 2010 04:16:36 +0000 (20:16 -0800)]
Merge "Tame some monkeys"
Ray Chen [Fri, 12 Mar 2010 03:54:52 +0000 (19:54 -0800)]
Merge "Add GPSProcessingMethod tag to ExifInterface."