OSDN Git Service
Leon Clarke [Tue, 2 Mar 2010 16:44:48 +0000 (08:44 -0800)]
am
ba74d7cc: am
e861b8f9: Merge " Fix issue with authentication with flash" into eclair-mr2
Merge commit '
ba74d7ccadc34d09d57886120e9d412d9edbc4d7'
* commit '
ba74d7ccadc34d09d57886120e9d412d9edbc4d7':
Fix issue with authentication with flash
Jean-Michel Trivi [Tue, 2 Mar 2010 16:41:33 +0000 (08:41 -0800)]
Merge "First implementation of the audio focus management as an extension of AudioManager and AudioService."
Leon Clarke [Tue, 2 Mar 2010 16:38:54 +0000 (08:38 -0800)]
am
e861b8f9: Merge " Fix issue with authentication with flash" into eclair-mr2
Merge commit '
e861b8f95dd52f89b7e7e34ba1bfc5b85c290292' into eclair-mr2-plus-aosp
* commit '
e861b8f95dd52f89b7e7e34ba1bfc5b85c290292':
Fix issue with authentication with flash
Cary Clark [Tue, 2 Mar 2010 16:37:18 +0000 (08:37 -0800)]
Merge "account for find dialog height when positioning layers"
Leon Clarke [Tue, 2 Mar 2010 16:33:10 +0000 (08:33 -0800)]
Merge " Fix issue with authentication with flash" into eclair-mr2
Mike Reed [Tue, 2 Mar 2010 16:27:28 +0000 (08:27 -0800)]
Merge "initial add of Arabic, Hebrew and Thai fonts."
Grace Kloba [Tue, 2 Mar 2010 16:21:22 +0000 (08:21 -0800)]
Merge "Start the synchronous load in the WebCore thread."
Mike Lockwood [Tue, 2 Mar 2010 15:38:40 +0000 (07:38 -0800)]
Merge "Don't eat IllegalArgumentExceptions in LocationManagerService."
Andy McFadden [Tue, 2 Mar 2010 15:36:23 +0000 (07:36 -0800)]
Merge "Tone down a log message."
Derek Sollenberger [Tue, 2 Mar 2010 15:00:21 +0000 (07:00 -0800)]
am
717c6ae0: (-s ours) am
2705c8f0: Merge "DO NOT MERGE. force plugins to render on top of browser content." into eclair-mr2
Merge commit '
717c6ae0cf1f82168b18ba2ba248313bcad7ae3e'
* commit '
717c6ae0cf1f82168b18ba2ba248313bcad7ae3e':
DO NOT MERGE. force plugins to render on top of browser content.
Derek Sollenberger [Tue, 2 Mar 2010 14:44:47 +0000 (06:44 -0800)]
am
2705c8f0: Merge "DO NOT MERGE. force plugins to render on top of browser content." into eclair-mr2
Merge commit '
2705c8f09975f1bf10c84af323a67c104a177129' into eclair-mr2-plus-aosp
* commit '
2705c8f09975f1bf10c84af323a67c104a177129':
DO NOT MERGE. force plugins to render on top of browser content.
Derek Sollenberger [Tue, 2 Mar 2010 14:33:32 +0000 (06:33 -0800)]
Merge "DO NOT MERGE. force plugins to render on top of browser content." into eclair-mr2
Patrick Scott [Tue, 2 Mar 2010 13:40:09 +0000 (05:40 -0800)]
Merge "Store the LoadListener in the SslErrorHandler passed to the client."
Mike Lockwood [Tue, 2 Mar 2010 12:29:04 +0000 (04:29 -0800)]
Merge "Don't poke user activity when unplugging unless screen is already on."
Ken Shirriff [Tue, 2 Mar 2010 06:46:07 +0000 (22:46 -0800)]
Merge "Remove DateException and obsolete DateUtils functions."
Romain Guy [Tue, 2 Mar 2010 05:56:22 +0000 (21:56 -0800)]
Merge "Cleaning in ListWithEditTextHeaderTest."
Dianne Hackborn [Tue, 2 Mar 2010 05:42:15 +0000 (21:42 -0800)]
Move the pointer location thing out of common.
Dianne Hackborn [Tue, 2 Mar 2010 01:43:39 +0000 (17:43 -0800)]
Fix issue #
2448075: aapt doesn't fix up activity-alias android:targetActivity links
And related:
- The aapt tool now sets a resource configurations sdk level to match any configs
that have been set (for example if you specify density your sdk level will be
at least 4).
- New option to modify the targetPackage attribute of instrumentation.
- Clean up of aapt options help.
- Fix of UI type values to leave 0 for "unspecified".
- Make the UI mode config APIs public.
Charles Chen [Tue, 2 Mar 2010 03:05:20 +0000 (19:05 -0800)]
Merge "Fixing a bug with TTS that caused TTS to ignore the default settings unless the user had set the defaults to always override app settings."
Mathias Agopian [Tue, 2 Mar 2010 01:51:17 +0000 (17:51 -0800)]
fix [
2425395] portrait UI briefly shows in landscape
the "freeze" timeout was not initialized properly which caused it
to kick-in immediately instead of after 5s
Mathias Agopian [Tue, 2 Mar 2010 00:09:43 +0000 (16:09 -0800)]
Added a name to Surface created by SurfaceFlinger
Updated the window manager to use this new facility.
Surfaces name are now printed by "dumpsys".
Daniel Sandler [Tue, 2 Mar 2010 01:16:55 +0000 (17:16 -0800)]
Merge "New vibrate/silent mode behavior."
Romain Guy [Tue, 2 Mar 2010 00:41:27 +0000 (16:41 -0800)]
Merge "Prevent crash in Dialog. Bug #
2249637"
Ficus Kirkpatrick [Tue, 2 Mar 2010 00:36:26 +0000 (16:36 -0800)]
Merge "Demote the famous ResourceTypes warning to LOGV."
Ficus Kirkpatrick [Tue, 2 Mar 2010 00:33:53 +0000 (16:33 -0800)]
Demote the famous ResourceTypes warning to LOGV.
It is spamming the log bigtime and can be promoted back to LOGW
or worse by whoever decides to actually investigate the bug.
Change-Id: I72d950155378f641ebdfbacabae774f5736a52bc
Grace Kloba [Tue, 2 Mar 2010 00:27:44 +0000 (16:27 -0800)]
am
c0524d26: (-s ours) am
3ff7cecd: Merge "DO NOT MERGE" into eclair-mr2
Merge commit '
c0524d26a6bcfa28a930f446717dffcd9ce3c3f5'
* commit '
c0524d26a6bcfa28a930f446717dffcd9ce3c3f5':
DO NOT MERGE
Marc Blank [Tue, 2 Mar 2010 00:18:27 +0000 (16:18 -0800)]
Merge "Rename _SYNC_LOCAL_ID to _SYNC_DATA"
Grace Kloba [Tue, 2 Mar 2010 00:13:21 +0000 (16:13 -0800)]
am
3ff7cecd: Merge "DO NOT MERGE" into eclair-mr2
Merge commit '
3ff7cecd3d9a1bb9485e32b0e6920f24022a5565' into eclair-mr2-plus-aosp
* commit '
3ff7cecd3d9a1bb9485e32b0e6920f24022a5565':
DO NOT MERGE
Grace Kloba [Tue, 2 Mar 2010 00:02:12 +0000 (16:02 -0800)]
Merge "DO NOT MERGE" into eclair-mr2
Vasu Nori [Mon, 1 Mar 2010 23:54:34 +0000 (15:54 -0800)]
Merge "revert due to the sqlite build problem on Mac.."
Jason Sams [Mon, 1 Mar 2010 23:42:47 +0000 (15:42 -0800)]
Merge "Add support for linking to a skia bitmap rather than always copying the data from the bitmap."
Jason Sams [Mon, 1 Mar 2010 23:42:03 +0000 (15:42 -0800)]
Merge "Support defered generation of mipmaps. With this change we support mipmap generation when the texture is uploaded to GL without requiring RS to retain the full chain."
Jason Sams [Mon, 1 Mar 2010 23:40:37 +0000 (15:40 -0800)]
Merge "Begin implementation of generated java files from RS files."
Andreas Huber [Mon, 1 Mar 2010 23:07:34 +0000 (15:07 -0800)]
Merge "Ensure that the audio codec instance is actually going away before we attempt to instantiate another one, otherwise we might end up with the software codec even though the hardware codec would have been available shortly."
Fred Quintana [Mon, 1 Mar 2010 22:47:22 +0000 (14:47 -0800)]
Merge "fix a system crash that occurs when ChooseAccountActivity is restarted from the icicle"
Vasu Nori [Mon, 1 Mar 2010 22:22:08 +0000 (14:22 -0800)]
Merge "register a logging func with sqlite, to get extra info on errors"
Ken Shirriff [Mon, 1 Mar 2010 22:19:26 +0000 (14:19 -0800)]
Remove DateException and obsolete DateUtils functions.
These functions are deprecated and no longer used.
Paul Westbrook [Mon, 1 Mar 2010 22:21:03 +0000 (14:21 -0800)]
Grace Kloba [Mon, 1 Mar 2010 21:16:46 +0000 (13:16 -0800)]
am
3ca122df: am
cfb50c66: Merge "If we get TOUCH_UP before getting the WebCore\'s response for TOUCH_DOWN, remove the pending TOUCH_EVENT before proceeding to fling." into eclair-mr2
Merge commit '
3ca122df9e9a25f7ed1c39ef18c5c4ba2e316fe8'
* commit '
3ca122df9e9a25f7ed1c39ef18c5c4ba2e316fe8':
If we get TOUCH_UP before getting the WebCore's
Grace Kloba [Mon, 1 Mar 2010 21:11:55 +0000 (13:11 -0800)]
am
cfb50c66: Merge "If we get TOUCH_UP before getting the WebCore\'s response for TOUCH_DOWN, remove the pending TOUCH_EVENT before proceeding to fling." into eclair-mr2
Merge commit '
cfb50c66faf4ff8a6f76884fdaf2dcb48d4d63a3' into eclair-mr2-plus-aosp
* commit '
cfb50c66faf4ff8a6f76884fdaf2dcb48d4d63a3':
If we get TOUCH_UP before getting the WebCore's
Joe Onorato [Mon, 1 Mar 2010 21:08:31 +0000 (13:08 -0800)]
Merge "Switch the services library to using the new Slog"
Grace Kloba [Mon, 1 Mar 2010 21:07:06 +0000 (13:07 -0800)]
Merge "If we get TOUCH_UP before getting the WebCore's response for TOUCH_DOWN, remove the pending TOUCH_EVENT before proceeding to fling." into eclair-mr2
Grace Kloba [Mon, 1 Mar 2010 21:06:58 +0000 (13:06 -0800)]
Merge "If zoom scale is set to minimum, treat it as in overview mode."
Joe Onorato [Mon, 1 Mar 2010 21:03:52 +0000 (13:03 -0800)]
Merge "Add new Slog class."
Fred Quintana [Mon, 1 Mar 2010 21:00:26 +0000 (13:00 -0800)]
Merge "fix a bug where if a syncmanager gets back a SyncAlreadyInProgress error it immediately reschedules another sync, thus burning up the battery if the sync is in progress for a while."
Derek Sollenberger [Mon, 1 Mar 2010 20:23:27 +0000 (12:23 -0800)]
am
a630dcdb: am
ecde72fe: Ensure the IME is rendered above the surface when we z-order the surface to be on top.
Merge commit '
a630dcdb956f9acb028dd03bc63b28874f100f8a'
* commit '
a630dcdb956f9acb028dd03bc63b28874f100f8a':
Ensure the IME is rendered above the surface when we z-order the surface to be on top.
Derek Sollenberger [Mon, 1 Mar 2010 20:09:10 +0000 (12:09 -0800)]
am
ecde72fe: Ensure the IME is rendered above the surface when we z-order the surface to be on top.
Merge commit '
ecde72fe411811ca02a2565bf73b86e6e8ddc76b' into eclair-mr2-plus-aosp
* commit '
ecde72fe411811ca02a2565bf73b86e6e8ddc76b':
Ensure the IME is rendered above the surface when we z-order the surface to be on top.
Gilles Debunne [Mon, 1 Mar 2010 19:55:25 +0000 (11:55 -0800)]
Merge "Take headers into account when expanding a ExpListView group."
Dianne Hackborn [Mon, 1 Mar 2010 19:33:15 +0000 (11:33 -0800)]
Merge "resolved conflicts for merge of
4dcd2ee8 to master"
Dianne Hackborn [Mon, 1 Mar 2010 19:30:02 +0000 (11:30 -0800)]
resolved conflicts for merge of
4dcd2ee8 to master
Wei Huang [Mon, 1 Mar 2010 19:25:45 +0000 (11:25 -0800)]
Merge "define the "seen" column for sms and pdu tables."
Dianne Hackborn [Mon, 1 Mar 2010 19:12:27 +0000 (11:12 -0800)]
Merge "cleanup Exit car mode in UI."
Grace Kloba [Mon, 1 Mar 2010 18:58:01 +0000 (10:58 -0800)]
Merge "Add a new WebCoreWorker thread to handle the tasks which should not block either UI or WebKit. It handles local file access, cache access and trim cache."
Mark Wagner [Mon, 1 Mar 2010 18:56:19 +0000 (10:56 -0800)]
Merge "check offset and don't crash"
Steve Block [Mon, 1 Mar 2010 18:54:30 +0000 (10:54 -0800)]
Merge "Removes a Geolocation test from the DumpRenderTree skipped list"
Steve Block [Mon, 1 Mar 2010 18:53:22 +0000 (10:53 -0800)]
Merge "Adds to DumpRenderTree the ability to look for Android-specific results"
Wei Huang [Fri, 26 Feb 2010 01:24:15 +0000 (17:24 -0800)]
define the "seen" column for sms and pdu tables.
Paul Westbrook [Mon, 1 Mar 2010 17:41:49 +0000 (09:41 -0800)]
The Android Open Source Project [Mon, 1 Mar 2010 17:30:21 +0000 (09:30 -0800)]
merge from open-source master
Marc Blank [Mon, 1 Mar 2010 16:37:20 +0000 (08:37 -0800)]
Merge "Put _SYNC_LOCAL_ID into event entities"
Dave Sparks [Mon, 1 Mar 2010 15:55:11 +0000 (07:55 -0800)]
Merge "Stop previous ringtone when silent is selected. Bug
2256593."
Derek Sollenberger [Mon, 1 Mar 2010 13:35:21 +0000 (05:35 -0800)]
Merge "force plugins to render on top of browser content."
Andrei Popescu [Mon, 1 Mar 2010 13:30:05 +0000 (05:30 -0800)]
Merge "VideoPlayer::onPrepared() can be called after the user pressed back in the VideoView. This can cass a NPE since our Timer would have been destroyed by then."
Gilles Debunne [Sat, 27 Feb 2010 21:13:11 +0000 (13:13 -0800)]
Merge "Fixes for ExpandableListView with headers/footers"
Mike Lockwood [Sat, 27 Feb 2010 14:16:54 +0000 (06:16 -0800)]
Merge "Fix synchronization problem in PowerManagerService.dump()"
Jacek Surazski [Sat, 27 Feb 2010 12:00:44 +0000 (04:00 -0800)]
Merge "Add BatteryInfo to ApplicationErrorReport."
Mathias Agopian [Sat, 27 Feb 2010 03:01:06 +0000 (19:01 -0800)]
Merge "to help debugging [
2461567] Home screen redraw messed up"
Mathias Agopian [Sat, 27 Feb 2010 03:00:56 +0000 (19:00 -0800)]
Merge "fix [
2475541] Deprecate Sensor.TYPE_ORIENTATION"
Mathias Agopian [Sat, 27 Feb 2010 02:59:23 +0000 (18:59 -0800)]
to help debugging [
2461567] Home screen redraw messed up
log SF's idea of the front buffer in dumpsys.
James Dong [Sat, 27 Feb 2010 02:56:22 +0000 (18:56 -0800)]
Merge "Don't allow MediaRecorder.setParameter() to be invoked in the following states: error, prepared or recording"
Eric Fischer [Sat, 27 Feb 2010 02:12:36 +0000 (18:12 -0800)]
Merge "Import new translations."
Robert Greenwalt [Sat, 27 Feb 2010 02:01:28 +0000 (18:01 -0800)]
Merge "Add build options for tethering."
Adam Powell [Sat, 27 Feb 2010 01:06:50 +0000 (17:06 -0800)]
Merge "ListView now tries to keep the position containing focused child views on-screen."
Adam Powell [Sat, 27 Feb 2010 00:46:35 +0000 (16:46 -0800)]
Merge "FastScroller now reports scroll state changes for its associated AbsListView"
Mike LeBeau [Fri, 26 Feb 2010 23:21:29 +0000 (15:21 -0800)]
Merge "Add an extra which allows to query *only* for the voice search language preference. This will be used by e.g. LatinIME to avoid extra computation when this is all that's needed (probably a common use case for this API)."
Mike Lockwood [Fri, 26 Feb 2010 23:19:10 +0000 (15:19 -0800)]
Merge "Tethering: Use battery changed broadcast instead of UMS broadcast to determine when USB is connected and disconnected."
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."