OSDN Git Service
Amith Yamasani [Tue, 30 Mar 2010 01:24:59 +0000 (18:24 -0700)]
Merge "Fix preloaded classes for API rename of BackupAgentHelper" into froyo
Romain Guy [Mon, 29 Mar 2010 23:31:14 +0000 (16:31 -0700)]
Merge "Fix possible security issue. Bug #
2553187" into froyo
Steve Howard [Mon, 29 Mar 2010 23:05:35 +0000 (16:05 -0700)]
Merge "Remove upside-down portrait orientation." into froyo
Christopher Tate [Mon, 29 Mar 2010 22:50:57 +0000 (15:50 -0700)]
Merge "API CHANGE: rename BackupHelperAgent => BackupAgentHelper per API Council" into froyo
Mathias Agopian [Mon, 29 Mar 2010 22:44:48 +0000 (15:44 -0700)]
Merge "Fix Android's glEGLImageTargetRenderbufferOES() wrapper" into froyo
Mathias Agopian [Mon, 29 Mar 2010 22:44:33 +0000 (15:44 -0700)]
Merge "fix [
2542425] memory leak during video recording" into froyo
Dirk Dougherty [Mon, 29 Mar 2010 22:36:53 +0000 (15:36 -0700)]
Merge "doc change: In fundamentals doc, make statement about synchronous execution of RPC less strict. Indicate that FLAG_ONEWAY applies only across processes." into froyo
Andreas Huber [Mon, 29 Mar 2010 22:16:20 +0000 (15:16 -0700)]
Merge "Limit the total amount of ID3 metadata to something (un-)reasonable: 3MB." into froyo
Mathias Agopian [Mon, 29 Mar 2010 22:12:19 +0000 (15:12 -0700)]
Fix Android's glEGLImageTargetRenderbufferOES() wrapper
glEGLImageTargetRenderbufferOES() pass the wrapped EGLImage
to the implementation, rather than the unwrapped one.
Change-Id: I149f9ed73e6ab9089110600e1db4311ba7a8c83a
Jim Miller [Mon, 29 Mar 2010 22:07:06 +0000 (15:07 -0700)]
Merge "Fix
2537999: Don't throw exception when SlidingTab has UNSPECIFIED specs" into froyo
Mathias Agopian [Mon, 29 Mar 2010 20:45:18 +0000 (13:45 -0700)]
fix [
2542425] memory leak during video recording
Vector::sort() is using _do_copy() incorrectly; _do_copy() calls the
copy constructor, not the assignment operator, so we need to destroy
the "destination" before copying the item.
Change-Id: Iaeeac808fa5341a7d219edeba4aa63d44f31473c
Romain Guy [Mon, 29 Mar 2010 20:00:42 +0000 (13:00 -0700)]
Merge "Tame the monkey. Bug #
2547546" into froyo
Dirk Dougherty [Mon, 29 Mar 2010 20:00:37 +0000 (13:00 -0700)]
Merge "doc change: Indicate that only the first 8 characters of the key alias are used." into froyo
Andreas Huber [Mon, 29 Mar 2010 19:58:03 +0000 (12:58 -0700)]
Merge "Fix a bug where the TimedEventQueue mistakenly accesses a bogus event if the only event in the queue has been cancelled while we're waiting for its scheduled time. Avoids potential int64_t overflow when converting from us to ns." into froyo
Romain Guy [Mon, 29 Mar 2010 19:28:20 +0000 (12:28 -0700)]
Merge "Rename private fields to break bad code examples" into froyo
Jack Palevich [Mon, 29 Mar 2010 19:09:57 +0000 (12:09 -0700)]
Add a test of EGL pausing and resuming.
Romain Guy [Mon, 29 Mar 2010 18:24:31 +0000 (11:24 -0700)]
Merge "Make EditTextPreference scrollable. Bug #
2549257" into froyo
Daniel Lehmann [Mon, 29 Mar 2010 17:30:54 +0000 (10:30 -0700)]
Merge "Increase name-label height so that "g" isn't cut off anymore. Decrease header height so that no resizes are required after background loading for most contacts Bug:
2542703 Bug:
2549485" into froyo
Jean-Michel Trivi [Mon, 29 Mar 2010 17:05:28 +0000 (10:05 -0700)]
Merge "Implement audio focus support in the notification manager." into froyo
Dirk Dougherty [Sat, 27 Mar 2010 01:25:05 +0000 (18:25 -0700)]
Merge "cherry-pick
7d39f981badf7ec75138d6ef97d37c57a63ab5f0 to froyo." into froyo
Dianne Hackborn [Sat, 27 Mar 2010 01:06:52 +0000 (18:06 -0700)]
Merge "Fix issue #
2538228: Intents targeting browsers constantly nagging" into froyo
Dirk Dougherty [Sat, 27 Mar 2010 00:50:26 +0000 (17:50 -0700)]
Merge "cherry-pick
af4786bcb5945f72e8639d74611cd5f9b0236710 to froyo" into froyo
Romain Guy [Sat, 27 Mar 2010 00:30:40 +0000 (17:30 -0700)]
Merge "Don't assume there's a selected position in touch mode. Bug #
2520743" into froyo
Dirk Dougherty [Fri, 26 Mar 2010 23:27:07 +0000 (16:27 -0700)]
Merge "Cherry-pick
97432e866eedd2a179242fa7017e03b6febe4887 to froyo." into froyo
Jean-Michel Trivi [Fri, 26 Mar 2010 23:17:38 +0000 (16:17 -0700)]
Merge "Cherry-picking this fix into Froyo." into froyo
Grace Kloba [Fri, 26 Mar 2010 22:30:26 +0000 (15:30 -0700)]
Merge "Remove long_press when WebView lost window focus. Reset touch mode too." into froyo
Grace Kloba [Fri, 26 Mar 2010 20:55:34 +0000 (13:55 -0700)]
Merge "cherry-picked
bf4650ca39c9153e38c76280ceb5e9af48b67751 to froyo" into froyo
Jean-Baptiste Queru [Fri, 26 Mar 2010 19:25:11 +0000 (12:25 -0700)]
Merge "Hide download manager." into froyo
Joe Onorato [Fri, 26 Mar 2010 19:14:49 +0000 (12:14 -0700)]
Merge "Fix StatusBarService deadlock for real this time." into froyo
Daniel Sandler [Fri, 26 Mar 2010 18:41:34 +0000 (11:41 -0700)]
Merge "Redesigned keyguard layout in the no-SIM case. DO NOT MERGE" into froyo
Brad Fitzpatrick [Fri, 26 Mar 2010 04:02:46 +0000 (21:02 -0700)]
Merge "Clarify some Binder docs regarding things that are thread-local."
Mathias Agopian [Fri, 26 Mar 2010 03:22:58 +0000 (20:22 -0700)]
Merge "fix [
2236865] STOPSHIP: bump soft gl and egl minor version number"
Mathias Agopian [Fri, 26 Mar 2010 03:21:12 +0000 (20:21 -0700)]
fix [
2236865] STOPSHIP: bump soft gl and egl minor version number
this is to allow developpers to deal with potiential differences
between the softgl versions.
Change-Id: I7ec2451d6af1be29818d66215b22977405d403e8
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)]