OSDN Git Service
Jim Miller [Fri, 26 Mar 2010 02:54:15 +0000 (19:54 -0700)]
Merge "Fix
2535700: Add support for enforcing password quality"
Marco Nelissen [Fri, 26 Mar 2010 02:06:23 +0000 (19:06 -0700)]
Merge "Remove spurious byte order marks from xml files."
Adam Powell [Fri, 26 Mar 2010 01:55:47 +0000 (18:55 -0700)]
Merge "Fix bug
2544916 - Fun with AbsListView touch mode"
Mathias Agopian [Fri, 26 Mar 2010 01:42:34 +0000 (18:42 -0700)]
Merge "fix [
2545826] calling into gralloc with external lock held"
Dan Egnor [Fri, 26 Mar 2010 00:59:00 +0000 (17:59 -0700)]
Merge "Add "dumpsys diskstats" to get a dump of disk-free values."
Jack Palevich [Fri, 26 Mar 2010 00:21:50 +0000 (17:21 -0700)]
Merge "GLSurfaceView pause and resume now synchronize with the GLThread."
Adam Powell [Fri, 26 Mar 2010 00:03:58 +0000 (17:03 -0700)]
Merge "API refactoring for OverScroller."
The Android Open Source Project [Thu, 25 Mar 2010 23:39:32 +0000 (16:39 -0700)]
merge from open-source master
Change-Id: I4d8f34986fd9e16ead8a22909263069dbb819d3e
Joe Onorato [Thu, 25 Mar 2010 23:00:25 +0000 (16:00 -0700)]
Merge "Fix
2495749 - System process crash when a notification switches sections."
Robert Greenwalt [Thu, 25 Mar 2010 22:50:25 +0000 (15:50 -0700)]
Merge "Fix Tethering of multiple downstream ifaces."
Fred Quintana [Thu, 25 Mar 2010 21:39:15 +0000 (14:39 -0700)]
Merge "check for nulls"
Mathias Agopian [Thu, 25 Mar 2010 21:34:49 +0000 (14:34 -0700)]
fix [
2545826] calling into gralloc with external lock held
Change-Id: I2d0e017382404c684c768a0dd0423d574213f10a
Patrick Scott [Thu, 25 Mar 2010 20:27:57 +0000 (13:27 -0700)]
Merge "Add .3gpp as the preferred extension for video/3gpp."
Daniel Sandler [Thu, 25 Mar 2010 20:26:36 +0000 (13:26 -0700)]
Merge "Use a more benign icon for ADB notifications."
Brad Fitzpatrick [Thu, 25 Mar 2010 20:22:15 +0000 (13:22 -0700)]
Merge "Better fix for gettid() sim-eng breakage from last night."
Jean-Baptiste Queru [Thu, 25 Mar 2010 19:35:22 +0000 (12:35 -0700)]
Merge "Hide download manager."
Dianne Hackborn [Thu, 25 Mar 2010 19:32:12 +0000 (12:32 -0700)]
Merge "Dumb late-night typo."
Joe Onorato [Thu, 25 Mar 2010 18:54:12 +0000 (11:54 -0700)]
Merge "Add window flags and window types to hierarchyviewer."
Jack Palevich [Thu, 25 Mar 2010 18:54:10 +0000 (11:54 -0700)]
Merge "Turn off thread logging (too many messages.)"
Neal Nguyen [Thu, 25 Mar 2010 18:09:38 +0000 (11:09 -0700)]
Merge "Refactoring PackageManagerHostTests helper functions into a utility class for easier sharing with future stress tests."
Mike Reed [Thu, 25 Mar 2010 18:04:02 +0000 (11:04 -0700)]
Merge "update dox that we ignore the exact parameter on computeBounds"
Jack Palevich [Thu, 25 Mar 2010 17:53:10 +0000 (10:53 -0700)]
Merge "Add logging of GLSurfaceView pause/resume calls."
Grace Kloba [Thu, 25 Mar 2010 17:32:22 +0000 (10:32 -0700)]
Merge "Turn on plugin signature checking."
San Mehat [Thu, 25 Mar 2010 17:20:44 +0000 (10:20 -0700)]
Merge "MountService: Switch all Log -> Slog"
Chih-Chung Chang [Thu, 25 Mar 2010 17:05:58 +0000 (10:05 -0700)]
Merge "Call unlinkToDeath() when we disconnect the Camera, so we don't hold the (weak) reference to it, which caused (small) memory leaks."
Nick Pelly [Thu, 25 Mar 2010 17:01:21 +0000 (10:01 -0700)]
Merge "Fix Phone App crash due to binary data in HSP/HFP stream."
Dave Sparks [Thu, 25 Mar 2010 15:24:24 +0000 (08:24 -0700)]
Merge "New lock/unlock sounds."
Leon Clarke [Thu, 25 Mar 2010 14:38:22 +0000 (07:38 -0700)]
Merge "b/issue?id=
2516676 Correctly scale the play button and youtube logo when embedded youtube videos are displayed at smaller than the suggested size."
Bjorn Bringert [Thu, 25 Mar 2010 14:36:46 +0000 (07:36 -0700)]
Merge "Use a secure setting for default browser geolocation permissions"
Wu-cheng Li [Thu, 25 Mar 2010 10:52:00 +0000 (03:52 -0700)]
Merge "Fix testCameraPreviewMemoryUsage test."
Brad Fitzpatrick [Thu, 25 Mar 2010 09:05:31 +0000 (02:05 -0700)]
Merge "Hopefully fix the sim-eng build, part 2."
Dianne Hackborn [Thu, 25 Mar 2010 08:02:32 +0000 (01:02 -0700)]
Merge "Fix issue #
2543231: chat invitation dialog does show all the time"
Amith Yamasani [Thu, 25 Mar 2010 05:26:10 +0000 (22:26 -0700)]
Merge "Fix
2242164 Soft keyboard keeps getting enabled even if I disable it"
Jeff Brown [Thu, 25 Mar 2010 03:06:41 +0000 (20:06 -0700)]
Merge "Ensure Binder finalizer handles partially initialized instances."
Grace Kloba [Thu, 25 Mar 2010 01:27:18 +0000 (18:27 -0700)]
Merge "There are two computeHorizontalScrollRange() got missed in the last conversion."
Dan Egnor [Thu, 25 Mar 2010 01:13:41 +0000 (18:13 -0700)]
Merge "Limit DropBox storage to 1000 files (by default)."
Irfan Sheriff [Thu, 25 Mar 2010 01:00:15 +0000 (18:00 -0700)]
Merge "Fix WakeLock issue for driver stop"
Adam Powell [Wed, 24 Mar 2010 22:11:45 +0000 (15:11 -0700)]
Merge "Fix some bugs/edge cases in ScrollView/HorizontalScrollView"
Adam Powell [Wed, 24 Mar 2010 21:05:55 +0000 (14:05 -0700)]
Merge "Fix for bug
2502886 - stupid monkeys."
Andreas Huber [Wed, 24 Mar 2010 20:53:28 +0000 (13:53 -0700)]
Merge "QueryCodecs now returns the names of the software codecs (non-OpenMax) as well."
Jack Palevich [Wed, 24 Mar 2010 20:50:33 +0000 (13:50 -0700)]
Merge "Improve our EGL management when pausing / resuming."
Dianne Hackborn [Wed, 24 Mar 2010 20:22:20 +0000 (13:22 -0700)]
Merge "Fix issue #
2540920: connectivity issues with tripit/pandora"
Kenny Root [Wed, 24 Mar 2010 20:20:21 +0000 (13:20 -0700)]
Merge "Use correct API version for UTF-8 checking"
Dianne Hackborn [Wed, 24 Mar 2010 20:11:55 +0000 (13:11 -0700)]
Merge "Fix issue #
2537384: Default keyboard input method switched on Eclaire to FRE77D upgrade"
Scott Main [Wed, 24 Mar 2010 20:10:54 +0000 (13:10 -0700)]
Merge "docs: fix several instances of the 'sidebox' class"
Amith Yamasani [Wed, 24 Mar 2010 19:43:28 +0000 (12:43 -0700)]
Merge "Asset update for key feedback bubble - removes edge artifact."
Dianne Hackborn [Wed, 24 Mar 2010 19:10:31 +0000 (12:10 -0700)]
Merge "Maybe fix #
2422586: Native crash in android_os_Parcel_closeFileDescriptor() killed the phone process"
Steve Block [Wed, 24 Mar 2010 18:07:59 +0000 (11:07 -0700)]
Merge "Fixes synchronous XHR requests which require authentication to complete synchronously"
Andreas Huber [Wed, 24 Mar 2010 18:05:46 +0000 (11:05 -0700)]
Merge "Enable early termination of the prefetcher's preparation phase."
Suchi Amalapurapu [Wed, 24 Mar 2010 17:43:59 +0000 (10:43 -0700)]
Merge "Clean up stale containers if needed at install time. This is needed when restoring applications installed on sdcard via Market after a data wipe. The stale containers need to be cleaned up before reinstalling again. Add a test case for installing when a stale container exists."
Fred Quintana [Wed, 24 Mar 2010 17:39:28 +0000 (10:39 -0700)]
Merge "fix bug where sync settings set lost upon upgrade from donut and eclair to froyo"
Vasu Nori [Wed, 24 Mar 2010 17:11:19 +0000 (10:11 -0700)]
Merge "when corruption occurs, log a warning before closing db"
Mike Lockwood [Wed, 24 Mar 2010 16:53:03 +0000 (09:53 -0700)]
Merge "Wait until GpsLocationProvider is fully initialized before returning from the constructor."
Mike Reed [Wed, 24 Mar 2010 16:45:58 +0000 (09:45 -0700)]
Merge "If we detect a 9patch chunk, force the config chooser to avoid 565, with its pre-dithering madness"
Suchi Amalapurapu [Wed, 24 Mar 2010 15:34:31 +0000 (08:34 -0700)]
Merge "Add new activity manager method to get list of running applications installed on sdcard. Use new method in UsbStorageActivity. Fix moving dex files. moveDex should be suffixed with LI since it uses Installer"
Leon Clarke [Wed, 24 Mar 2010 12:09:53 +0000 (05:09 -0700)]
Merge "Fix for when flash loads cached crossdomain.xml files. Cache the x-permitted-cross-domain-policies header. b/issue?id=
2519669"
Jack Palevich [Wed, 24 Mar 2010 04:20:42 +0000 (21:20 -0700)]
Merge "GLSurfaceView: Log egl failures"
Mathias Agopian [Wed, 24 Mar 2010 03:17:13 +0000 (20:17 -0700)]
Merge "another small step towards fixing [
2501808] sapphire: OOM in GPU Surface area"
Neal Nguyen [Wed, 24 Mar 2010 01:31:26 +0000 (18:31 -0700)]
Merge "Adding some automated tests for apps on SD (and their corresponding apps)."
Adam Powell [Wed, 24 Mar 2010 00:40:02 +0000 (17:40 -0700)]
Merge "Fix bug
2531732 - DateTimeView explodes on bad system date format."
Christopher Tate [Wed, 24 Mar 2010 00:26:09 +0000 (17:26 -0700)]
Merge "Return the right thing from Context.getApplicationContext()"
Dianne Hackborn [Tue, 23 Mar 2010 23:44:48 +0000 (16:44 -0700)]
Merge "Fix issue #
2538211: system server crash"
Adam Powell [Tue, 23 Mar 2010 23:40:36 +0000 (16:40 -0700)]
Merge "Make WebView scroll bars compress during overscroll."
Mathias Agopian [Tue, 23 Mar 2010 23:29:03 +0000 (16:29 -0700)]
Merge "one step toward fixing [
2501808] sapphire: OOM in GPU Surface area"
Xia Wang [Tue, 23 Mar 2010 22:37:32 +0000 (15:37 -0700)]
Merge " * Move connectivity manager test closer to source. * Add license header to java files * Remove google related information from the test"
Andreas Huber [Tue, 23 Mar 2010 22:34:18 +0000 (15:34 -0700)]
Merge "Clear the local prefetcher strong reference before signalling that prepare() was cancelled early in order to avoid a race condition that occasionally triggered an assertion from the main thread."
Adam Powell [Tue, 23 Mar 2010 21:10:50 +0000 (14:10 -0700)]
Adam Powell [Tue, 23 Mar 2010 21:10:00 +0000 (14:10 -0700)]
Vasu Nori [Tue, 23 Mar 2010 20:03:43 +0000 (13:03 -0700)]
Merge "print finalizer warning before closing the cursor in finalize"
Romain Guy [Tue, 23 Mar 2010 19:44:13 +0000 (12:44 -0700)]
Merge "Correctly bind spinner data to TextView. Bug code.google.com/p/android/issues/detail?id=7251"
Derek Sollenberger [Tue, 23 Mar 2010 19:35:35 +0000 (12:35 -0700)]
Merge "fixing problem with allocating too much memory to a surface by fixing the size of the surface when it exceeds a threshold and resizing the surface when it falls beneath the threshold."
Patrick Scott [Tue, 23 Mar 2010 19:34:53 +0000 (12:34 -0700)]
Merge "Fix rebuilding of these two apks."
Dianne Hackborn [Tue, 23 Mar 2010 18:54:09 +0000 (11:54 -0700)]
Merge "Improve switching to car mode, retain night mode option."
Dianne Hackborn [Tue, 23 Mar 2010 18:53:12 +0000 (11:53 -0700)]
Merge "Don't use dim behind for the search box."
Dianne Hackborn [Tue, 23 Mar 2010 18:52:14 +0000 (11:52 -0700)]
Merge "Fix bug where group IDs were not being assigned during boot."
Jean-Baptiste Queru [Tue, 23 Mar 2010 18:49:54 +0000 (11:49 -0700)]
Merge "Make DownloadBase public"
San Mehat [Tue, 23 Mar 2010 18:25:31 +0000 (11:25 -0700)]
Merge "Asec: Add new 'StorageNotFound' response code handling for container paths"
Mike Lockwood [Tue, 23 Mar 2010 17:53:25 +0000 (10:53 -0700)]
Merge "LocationTracker: Fix default values for debug and signal strength logging."
Suchi Amalapurapu [Tue, 23 Mar 2010 17:27:51 +0000 (10:27 -0700)]
Merge "Don't delete stale containers on sdcard. Comment out flaky test"
Vasu Nori [Tue, 23 Mar 2010 17:16:38 +0000 (10:16 -0700)]
Merge "close SQLiteStatement objects in finally block"
Robert Greenwalt [Tue, 23 Mar 2010 16:52:07 +0000 (09:52 -0700)]
Merge "Fix Tethering when DUN is required but wifi is ok"
Kenny Root [Tue, 23 Mar 2010 15:07:47 +0000 (08:07 -0700)]
Merge "Compact when NativeDaemonConnector hits buffer limit"
Mike Lockwood [Tue, 23 Mar 2010 11:54:18 +0000 (04:54 -0700)]
Merge "GpsLocationProvider: Do our work in a Handler running in a separate thread."
Kenny Root [Tue, 23 Mar 2010 06:18:52 +0000 (23:18 -0700)]
Merge "Advance encodedKeySearchIndex if encodedKey matches a suffix of a parameter."
satok [Tue, 23 Mar 2010 05:40:10 +0000 (22:40 -0700)]
Merge "Call super.close() in MargeCursor"
Romain Guy [Tue, 23 Mar 2010 02:08:22 +0000 (19:08 -0700)]
Merge "Improve export to bitmap layers for HierarchyViewer."
Dianne Hackborn [Tue, 23 Mar 2010 01:19:10 +0000 (18:19 -0700)]
Merge "Fix restoring of permissions after a reboot."
Shimeng (Simon) Wang [Tue, 23 Mar 2010 00:21:48 +0000 (17:21 -0700)]
Merge "Check mWebViewCore to prevent potential NPE."
The Android Open Source Project [Mon, 22 Mar 2010 22:55:38 +0000 (15:55 -0700)]
merge from open-source master
Change-Id: Ie60db5faf407344b8fbe3d5c1e7c01e927ff251e
Eric Laurent [Mon, 22 Mar 2010 22:48:42 +0000 (15:48 -0700)]
Merge "Fix issue
2472495: Phone cannot be set to silent mode via volume keys while Driveabout is taking."
Jake Hamby [Mon, 22 Mar 2010 22:47:37 +0000 (15:47 -0700)]
Merge "Fix some typos and logging of calls to CDMA methods."
Mike Lockwood [Mon, 22 Mar 2010 21:28:35 +0000 (14:28 -0700)]
Merge "Improve wakelock debugging:"
Romain Guy [Mon, 22 Mar 2010 21:20:15 +0000 (14:20 -0700)]
Merge "Fix possible NPE in AdapterView's OnItemClickListener clients. Bug #
2533718"
Jean-Michel Trivi [Mon, 22 Mar 2010 20:59:09 +0000 (13:59 -0700)]
Merge "Unhide the MediaButton receiver API in android.media.AudioManager"
Mathias Agopian [Mon, 22 Mar 2010 20:17:50 +0000 (13:17 -0700)]
Merge "Updated to WMM2010"
Derek Sollenberger [Mon, 22 Mar 2010 20:10:50 +0000 (13:10 -0700)]
Merge "Adding a hidden method to check if a surface is fixed in size."
Brad Fitzpatrick [Mon, 22 Mar 2010 19:49:25 +0000 (12:49 -0700)]
Merge "Make getting wifi state lockless."
Marco Nelissen [Mon, 22 Mar 2010 19:03:37 +0000 (12:03 -0700)]
Merge "Fix Tabwidget copy/paste bug."
Mark Wagner [Mon, 22 Mar 2010 18:51:51 +0000 (11:51 -0700)]
Merge "null check"
Xia Wang [Mon, 22 Mar 2010 18:16:16 +0000 (11:16 -0700)]
Merge "Add connectivity manager automation test framework: - Create a dummy activity - ConnectivityManagerTestActivity - to listen to broadcast from connectivity manager, to control wifi, and to verify that connectivity information for different network types. This framework will be used for funcitonal tests and stress tests."