OSDN Git Service
Amith Yamasani [Thu, 11 Mar 2010 01:02:40 +0000 (17:02 -0800)]
Merge "Fixing bug
2411394 - Monkey crash due to incorrect test service manifest"
Dan Egnor [Thu, 11 Mar 2010 00:53:15 +0000 (16:53 -0800)]
Merge "Fix rare NPE in DropBoxManagerService"
Robert Greenwalt [Thu, 11 Mar 2010 00:52:27 +0000 (16:52 -0800)]
Merge "Make HiPri work when already connected."
Dianne Hackborn [Thu, 11 Mar 2010 00:51:13 +0000 (16:51 -0800)]
Merge "Further improvements to window management!"
Erik [Thu, 11 Mar 2010 00:29:44 +0000 (16:29 -0800)]
Merge "Noticed comment field when splitting guests wasn't being cleared."
Joe Onorato [Thu, 11 Mar 2010 00:27:50 +0000 (16:27 -0800)]
Merge "use ifContentScrolls in the windowshade"
Suchi Amalapurapu [Thu, 11 Mar 2010 00:15:35 +0000 (16:15 -0800)]
Merge "Dont include code size for apps on sdcard. Use constants defined in PackageHelper for user preferences to install auto, internal, external. Set default install location to external. Update settings db version number"
Fred Quintana [Wed, 10 Mar 2010 22:08:29 +0000 (14:08 -0800)]
Merge "check if the binding to the authenticator has been disconnected during the GetAccuintsByTypeAndFeature operation and abort if it has been, thus avoiding an NPE"
Fred Quintana [Wed, 10 Mar 2010 21:41:44 +0000 (13:41 -0800)]
Merge "make the syncmanager keep track if whether a service has been unbound from so that it knows whether to call unbind at a later time"
Andreas Huber [Wed, 10 Mar 2010 21:33:51 +0000 (13:33 -0800)]
Merge "Extend stagefright tool to extract either album art or video frame."
Nick Kralevich [Wed, 10 Mar 2010 21:11:46 +0000 (13:11 -0800)]
Merge "Don't rely on the system locale for converting to/from bytes."
Amith Yamasani [Wed, 10 Mar 2010 20:53:20 +0000 (12:53 -0800)]
Merge "Fixing bug
2502522 - Accessibility events contain text of invisible views"
Dianne Hackborn [Wed, 10 Mar 2010 20:26:40 +0000 (12:26 -0800)]
Merge "Fix: Polished icons for car mode notification"
Daniel Sandler [Wed, 10 Mar 2010 20:03:07 +0000 (12:03 -0800)]
Merge "Add VIBRATE_IN_SILENT to the settings database & backup."
Kenny Root [Wed, 10 Mar 2010 19:39:12 +0000 (11:39 -0800)]
Merge "Revert "Dedupe resource config pointers""
Andreas Huber [Wed, 10 Mar 2010 19:12:56 +0000 (11:12 -0800)]
Merge "Instead of instantiating StagefrightMetadataRetriever directly, instantiate a MediaMetadataRetriever which will do-the-right-thing(tm) even for .wma/.wmv/.asf files."
Marco Nelissen [Wed, 10 Mar 2010 18:58:23 +0000 (10:58 -0800)]
Merge "MEDIA_PLAYER_STATE_ERROR is not a bitmask (b/
2502881)"
Adam Powell [Wed, 10 Mar 2010 18:50:38 +0000 (10:50 -0800)]
Merge "Added ViewConfiguration.getScaledPagingTouchSlop()"
Leon Scroggins [Wed, 10 Mar 2010 18:07:46 +0000 (10:07 -0800)]
Merge "When context is voice, show the microphone."
Chia-chi Yeh [Wed, 10 Mar 2010 14:36:06 +0000 (06:36 -0800)]
Merge "YuvImage: jpeg_set_quality() should be called after jpeg_set_defaults()."
Brad Fitzpatrick [Wed, 10 Mar 2010 06:48:40 +0000 (22:48 -0800)]
Merge "SettingsProvider: dup-suppress from cache."
Jean-Baptiste Queru [Wed, 10 Mar 2010 02:44:06 +0000 (18:44 -0800)]
Merge "Use proper config to enable LVMX."
Jean-Baptiste Queru [Wed, 10 Mar 2010 02:43:57 +0000 (18:43 -0800)]
Merge "Use proper config to enable LVMX"
Jean-Baptiste Queru [Wed, 10 Mar 2010 02:13:59 +0000 (18:13 -0800)]
Use proper config to enable LVMX
Change-Id: Ifa75a82884b99aeee139e055f40e7c510cf28213
Brad Fitzpatrick [Wed, 10 Mar 2010 01:24:51 +0000 (17:24 -0800)]
Merge "SettingsProvider: defensively cap size of settings kept cached in memory."
Dianne Hackborn [Tue, 9 Mar 2010 23:00:30 +0000 (15:00 -0800)]
Add ability for some manifest attributes to reference resources.
This loosens our restriction on many manifest attributes requiring
literal string values, to allow various ones to use values from
resources. This is only allowed if the resource value does not change
from configuration changes, and the restriction is still in place
for attributes that are core to security (requesting permissions) or
market operation (used libraries and features etc).
Change-Id: I4da02f6a5196cb6a7dbcff9ac25403904c42c2c8
Jaikumar Ganesh [Wed, 10 Mar 2010 00:56:36 +0000 (16:56 -0800)]
Merge "Add an API to set the link timeout."
Brad Fitzpatrick [Wed, 10 Mar 2010 00:42:44 +0000 (16:42 -0800)]
Merge "Speed up ContentProvider.query() in simple case by ~30%"
Romain Guy [Wed, 10 Mar 2010 00:39:13 +0000 (16:39 -0800)]
Merge "Support unbundled bookmarks. Bug #
2460685"
Ray Chen [Wed, 10 Mar 2010 00:20:59 +0000 (16:20 -0800)]
Merge "Avoid overriding DATE_TAKEN by unreliable file time. MediaProvider will calculate it if needed."
Glenn Kasten [Wed, 10 Mar 2010 00:00:17 +0000 (16:00 -0800)]
Merge "Initial version of LifeVibes integration. Also changed tabs to spaces in other audioflinger files."
Robert Greenwalt [Tue, 9 Mar 2010 23:42:34 +0000 (15:42 -0800)]
Merge "Fix NO_CONNECTIVITY flag in some cases."
Adam Powell [Tue, 9 Mar 2010 23:38:56 +0000 (15:38 -0800)]
Merge "Fix ListView filter popups when window focus changes"
Mike Lockwood [Tue, 9 Mar 2010 22:57:41 +0000 (14:57 -0800)]
Merge "Don't let hidden keyguard interfere with button and screen brightness overrides"
Mike Lockwood [Tue, 9 Mar 2010 22:50:18 +0000 (14:50 -0800)]
Merge "Add new shutdown observer for MountService. Use new observer before rebooting and shutting down. Add some unit tests for unmount and shutdown code paths Fix registering/unregistering part in MountService Use ShutdownThread in PowerManager.reboot() Add reboot support to ShutdownThread. Remove MountService code from PowerManagerService.java and Power.java. Clean shutdown/reboot is handled exclusively by ShutdownThread now."
Grace Kloba [Tue, 9 Mar 2010 22:20:34 +0000 (14:20 -0800)]
Merge "Add an api to set WebView over scroll background."
Adam Powell [Tue, 9 Mar 2010 22:19:47 +0000 (14:19 -0800)]
Merge "Fix bug with AbsListView position scrolling"
Glenn Kasten [Fri, 5 Mar 2010 20:18:01 +0000 (12:18 -0800)]
Initial version of LifeVibes integration.
Also changed tabs to spaces in other audioflinger files.
Vasu Nori [Tue, 9 Mar 2010 21:42:20 +0000 (13:42 -0800)]
Merge "add REPLACE to the list of cached sql stmnts"
Jean-Michel Trivi [Tue, 9 Mar 2010 21:17:35 +0000 (13:17 -0800)]
Merge "Fix bug
2329540 Part 1 of the fix: when the user doesn't elect to use the car dock for music and media, the APM was not aware of the device being docked. This is fixed by dissociating the notification for the APM of the docking to the dock from the sink state change of the A2DP device. Also missing was forcing the volumes to be reevaluated whenever the device is docked or undocked, as volumes for docks may differ, even when the same output device is being used."
Jean-Michel Trivi [Tue, 9 Mar 2010 17:26:08 +0000 (09:26 -0800)]
Fix bug
2329540
Part 1 of the fix: when the user doesn't elect to use the car dock
for music and media, the APM was not aware of the device being
docked.
This is fixed by dissociating the notification for the APM of
the docking to the dock from the sink state change of the A2DP
device.
Also missing was forcing the volumes to be reevaluated whenever
the device is docked or undocked, as volumes for docks may
differ, even when the same output device is being used.
Change-Id: If5314e27821a71adbd6df6fdf887c45208241d96
Robert Greenwalt [Tue, 9 Mar 2010 19:55:53 +0000 (11:55 -0800)]
Merge "Re-add tethered notification to framework."
Adam Powell [Tue, 9 Mar 2010 19:55:05 +0000 (11:55 -0800)]
Merge "Restore old/buggy behavior of ListView.getCheckItemIds() for adapters without stable IDs to support legacy code."
Vasu Nori [Tue, 9 Mar 2010 19:46:57 +0000 (11:46 -0800)]
Merge "modify comments to be more accurate"
Andreas Huber [Tue, 9 Mar 2010 19:43:31 +0000 (11:43 -0800)]
Merge "Fix a typo in VideoView.java that disabled the seek-back button by default."
Mike LeBeau [Tue, 9 Mar 2010 18:43:47 +0000 (10:43 -0800)]
Merge "Add new LoggingEvents for more detailed text modification actions for voice input."
Mike LeBeau [Tue, 9 Mar 2010 18:42:35 +0000 (10:42 -0800)]
Add new LoggingEvents for more detailed text modification actions for voice input.
Change-Id: I70df3612067f1c8c512a7bbe6c02381724f76bbf
Jean-Michel Trivi [Tue, 9 Mar 2010 18:31:30 +0000 (10:31 -0800)]
Merge "Fix bug
2481825 When TTS is synthesizing to a file, return an error if the file cannot be created."
Andrei Popescu [Tue, 9 Mar 2010 18:06:23 +0000 (10:06 -0800)]
Merge "Make sure access to WebView::mWebViewCore is synchronized."
Ficus Kirkpatrick [Tue, 9 Mar 2010 18:01:00 +0000 (10:01 -0800)]
Merge "Add a LOG_TAG for android.graphics.Graphics JNI."
Suchi Amalapurapu [Tue, 9 Mar 2010 17:58:40 +0000 (09:58 -0800)]
Merge "Add conditions to check for updated system applications. Restrict them to internal flash only even before we copy."
Jean-Michel Trivi [Tue, 9 Mar 2010 17:17:45 +0000 (09:17 -0800)]
Merge "Unhide API additions to AudioManager for AudioFocus support."
Andreas Huber [Tue, 9 Mar 2010 17:09:27 +0000 (09:09 -0800)]
Merge "Use a more descriptive user-agent string (similar to PV's before) in stagefright http requests."
Steve Block [Tue, 9 Mar 2010 15:02:18 +0000 (07:02 -0800)]
Merge "Removes from DumpRenderTree the superfluous result file for tests that time out."
Steve Block [Tue, 9 Mar 2010 13:42:09 +0000 (05:42 -0800)]
Merge "Removes regex tests from the DumpRenderTree skipped list"
Steve Block [Tue, 9 Mar 2010 12:25:13 +0000 (04:25 -0800)]
Merge "Add shared workers tests to DumpRenderTree skipped list"
Brad Fitzpatrick [Tue, 9 Mar 2010 06:18:52 +0000 (22:18 -0800)]
Merge "Fix Parcel leak in ContentProvider.call()"
Mathias Agopian [Tue, 9 Mar 2010 03:29:09 +0000 (19:29 -0800)]
improve SF logging/debugging a little bit
Change-Id: I6a57f89c25defc293fd748cc1fbd710031c02ec2
Mathias Agopian [Tue, 9 Mar 2010 03:24:27 +0000 (19:24 -0800)]
Merge "Fix a small bug where we could compute SharedBufferStack's tail incorrectly."
Mathias Agopian [Tue, 9 Mar 2010 03:23:26 +0000 (19:23 -0800)]
Fix a small bug where we could compute SharedBufferStack's tail incorrectly.
Also add "tail" to the debug dump().
Change-Id: I04b1ea375dfc9ddcc22f0c6b6cd01300e507572e
Dan Egnor [Tue, 9 Mar 2010 03:23:01 +0000 (19:23 -0800)]
Merge "More consistent and clear traces.txt reporting."
Adam Powell [Tue, 9 Mar 2010 03:11:16 +0000 (19:11 -0800)]
Merge "Fix issues with ListView.smoothScrollBy"
Dmitri Plotnikov [Tue, 9 Mar 2010 02:04:24 +0000 (18:04 -0800)]
Merge "Showing phonetic name in the contact header."
Chia-chi Yeh [Tue, 9 Mar 2010 01:50:56 +0000 (17:50 -0800)]
Merge "keystore: add AID_ROOT into the user table."
Romain Guy [Tue, 9 Mar 2010 01:46:36 +0000 (17:46 -0800)]
Merge "Fix scrolling bug in AutoCompleteTextView. Bug #
2495033"
Chia-chi Yeh [Tue, 9 Mar 2010 01:41:32 +0000 (09:41 +0800)]
keystore: add AID_ROOT into the user table.
Change-Id: I4b9cf24d75ca79583d7913bbb2c33745a2316cde
The Android Open Source Project [Tue, 9 Mar 2010 01:14:25 +0000 (17:14 -0800)]
merge from open-source master
Change-Id: I66d3db4c9ed3f54ce17a8d64ca0c6cce6941cdaa
Daniel Lehmann [Tue, 9 Mar 2010 01:10:03 +0000 (17:10 -0800)]
Merge "Expose the Uri of the newly created contact Bug:
2448065"
Eric Fischer [Tue, 9 Mar 2010 00:59:48 +0000 (16:59 -0800)]
Merge "Guard against calls to getTextAfterCursor() in text that has no cursor."
Tom Taylor [Tue, 9 Mar 2010 00:35:38 +0000 (16:35 -0800)]
Merge "Remove mms-common library"
Robert Greenwalt [Tue, 9 Mar 2010 00:35:13 +0000 (16:35 -0800)]
Merge "Update the Mcc Table for Canada."
Tom Taylor [Tue, 9 Mar 2010 00:34:53 +0000 (16:34 -0800)]
Remove mms-common library
Put the Mms files back in the framework where they've been since 1.0.
Change-Id: I3c449468053ddd82d35c45a06d71957de660bf99
Wu-cheng Li [Tue, 9 Mar 2010 00:31:57 +0000 (16:31 -0800)]
Merge "Add camera parameter string constant for "true"."
Andreas Huber [Tue, 9 Mar 2010 00:02:16 +0000 (16:02 -0800)]
Merge "The audio track was accidentally not participating in the prefetch since it wasn't started at the time prepare() was called. Also, properly report the cached duration even near the end when the source has no more data to fetch."
Mathias Agopian [Mon, 8 Mar 2010 23:35:44 +0000 (15:35 -0800)]
Merge "fixes for [
2474091] Saw Poor behaviour playing a video."
Dianne Hackborn [Mon, 8 Mar 2010 22:58:25 +0000 (14:58 -0800)]
Merge "Hold wake lock while shutting down."
Romain Guy [Mon, 8 Mar 2010 22:44:00 +0000 (14:44 -0800)]
Merge "Report scroll events from ScrollView and HorizontalScrollView. Bug #
2342763"
Andreas Huber [Mon, 8 Mar 2010 22:29:38 +0000 (14:29 -0800)]
Merge "Apparently a MemoryHeapPMem must be slap()ed for SurfaceFlinger to use the contained buffers."
Andreas Huber [Mon, 8 Mar 2010 21:07:08 +0000 (13:07 -0800)]
Merge "Increase the amount of data buffered at preparation time. Make sure to start preparing after the codecs have been started, otherwise no buffering will happen."
Daniel Sandler [Mon, 8 Mar 2010 20:01:00 +0000 (12:01 -0800)]
Merge "Correct path to LowBattery.ogg."
Andreas Huber [Mon, 8 Mar 2010 19:24:47 +0000 (11:24 -0800)]
Merge "The prefetched source was unnecessarily holding a lock while receiving data from the network, sometimes blocking for seconds over 2G networks with corresponding drops in audio playback. Also, if the cache was full we'd report a cache duration of 0 instead of maximum size."
Mike LeBeau [Mon, 8 Mar 2010 19:22:58 +0000 (11:22 -0800)]
Merge "Update comments for the new EXTRA_VOICE_SEARCH_RESULT_HTTP_HEADERS."
Mathias Agopian [Mon, 8 Mar 2010 19:14:20 +0000 (11:14 -0800)]
fixes for [
2474091] Saw Poor behaviour playing a video.
- fix a bug when hacking video buffers into gralloc buffers
where the buffer size was incorrect this was causing the
"direct-form-texture" mode to fail
- also when the above fails, make sure to revert to the
"mdp copy mode" before going to "slow mode"
- finally disable completely the "direct-from-texture" mode
for now. It cannot work because the allocated buffers can't
respect the GPU constraints (alignment and such). We'll
have to find a solution for that.
Vasu Nori [Mon, 8 Mar 2010 19:13:52 +0000 (11:13 -0800)]
Merge "caching bug in SQLiteDatabase causes invalid finalizer warnings"
Vasu Nori [Mon, 8 Mar 2010 19:08:10 +0000 (11:08 -0800)]
Merge "rollback AFTER commit causes warning message from sqlite bug:
2486731"
Steve Block [Mon, 8 Mar 2010 18:43:38 +0000 (10:43 -0800)]
Merge "Updates WebAddress to ignore the colon after the host component of a URL if no port is specified"
Leon Scroggins [Mon, 8 Mar 2010 18:42:42 +0000 (10:42 -0800)]
Merge "Pass keys to plugin while shift is held down."
Patrick Scott [Mon, 8 Mar 2010 17:54:08 +0000 (09:54 -0800)]
Merge "If both cookies have null values, use the name difference."
Mike LeBeau [Mon, 8 Mar 2010 17:41:10 +0000 (09:41 -0800)]
Merge "Adding support for passing HTTP headers to a Browser"
Eric Laurent [Mon, 8 Mar 2010 17:40:15 +0000 (09:40 -0800)]
Merge "Fix issue
2317760: Change the priority between wired headset and A2DP."
San Mehat [Mon, 8 Mar 2010 17:05:44 +0000 (09:05 -0800)]
Merge "dumpstate: Add secure container + mounted filesystems to bugreport"
Amith Yamasani [Mon, 8 Mar 2010 17:02:31 +0000 (09:02 -0800)]
Merge "Fix a SettingsProvider test :
2377540"
Patrick Scott [Mon, 8 Mar 2010 16:22:59 +0000 (08:22 -0800)]
Merge "Cookies like "a=b" were broken due to my previous change."
Steve Block [Mon, 8 Mar 2010 16:16:41 +0000 (08:16 -0800)]
Merge "For synchronous loads, load file URLs in the WebCore thread, rather than in the new WebViewWorker thread"
Bjorn Bringert [Mon, 8 Mar 2010 15:16:16 +0000 (07:16 -0800)]
Merge "Fixing: Position of right button edge is different for VS"
Eric Laurent [Sat, 6 Mar 2010 23:46:31 +0000 (15:46 -0800)]
Fix issue
2317760: Change the priority between wired headset and A2DP.
Modified audio policy manager so that wired headset has precedence over A2DP headset.
Mike Lockwood [Mon, 8 Mar 2010 14:47:49 +0000 (06:47 -0800)]
Merge "location: dump LocationProvider internal state"
Mike Reed [Mon, 8 Mar 2010 13:54:42 +0000 (05:54 -0800)]
Merge "hidden api sameAs() to compare the pixels of 2 bitmaps for equality"
Bjorn Bringert [Mon, 8 Mar 2010 13:45:42 +0000 (05:45 -0800)]
Merge "Hide Go button in browser when no text is entered"
Mike Lockwood [Mon, 8 Mar 2010 12:12:28 +0000 (04:12 -0800)]
Merge "Disable car mode should not require DISABLE_KEYGUARD permission"