OSDN Git Service
Dianne Hackborn [Thu, 8 Apr 2010 18:35:27 +0000 (11:35 -0700)]
Merge "Fix issue #
2580316: Contacts and Phone app not supporting landscape mode..." into froyo
Scott Main [Thu, 8 Apr 2010 18:22:42 +0000 (11:22 -0700)]
Merge "docs: revisions to the installLocation documentation" into froyo
Jaikumar Ganesh [Thu, 8 Apr 2010 17:01:50 +0000 (10:01 -0700)]
Merge "Don't allow connection to profiles in TURNING_OFF state." into froyo
Andrei Popescu [Thu, 8 Apr 2010 16:07:32 +0000 (09:07 -0700)]
Merge "Avoid calling proxy.playbackEnded() again in onCustomViewHidden(). It is now always called via the MediaPlayer.onCompletion() callback." into froyo
Andreas Huber [Thu, 8 Apr 2010 15:27:20 +0000 (08:27 -0700)]
Merge "Increase the size of the pages used in CachingDataSource (total amount of memory used remains the same) to compensate for reduced locality of audio/video data requests. Also fixes a mistaken trailing "\r\n" in the range header and better error handling on http connection." into froyo
Daniel Sandler [Thu, 8 Apr 2010 13:07:57 +0000 (06:07 -0700)]
Merge "Transparent alarm icons for lockscreen." into froyo
Daniel Sandler [Thu, 8 Apr 2010 13:06:50 +0000 (06:06 -0700)]
Merge "Add emergency call button to PUK'd lockscreen." into froyo
Suchi Amalapurapu [Thu, 8 Apr 2010 04:24:36 +0000 (21:24 -0700)]
Merge "Fix
2579461 Move install location values to secure settings. Diable attribute for UI. Set default value to auto. Add command line interface to set install location via pm." into froyo
Grace Kloba [Thu, 8 Apr 2010 01:57:51 +0000 (18:57 -0700)]
Merge "Revert "Use the content width to calculate the zoom overview"" into froyo
Dianne Hackborn [Thu, 8 Apr 2010 01:37:04 +0000 (18:37 -0700)]
Merge "Fix issue #
2549955: Moving the application fails -Activity Manager Crash on launching the app" into froyo
Dianne Hackborn [Thu, 8 Apr 2010 01:31:06 +0000 (18:31 -0700)]
Merge "Fix issue #
2528537: android.os.DeadObjectException" into froyo
Grace Kloba [Thu, 8 Apr 2010 01:18:17 +0000 (18:18 -0700)]
Merge "Cherry-pick https://android-git.corp.google.com/g/#change,38305" into froyo
John Wang [Thu, 8 Apr 2010 00:51:41 +0000 (17:51 -0700)]
Merge "Add emergencyOnly indicator in ServiceState." into froyo
San Mehat [Wed, 7 Apr 2010 22:32:44 +0000 (15:32 -0700)]
Merge "NetworkManagementService: Remove 'maxkbs' parameter from throttle API" into froyo
Suchi Amalapurapu [Wed, 7 Apr 2010 22:25:51 +0000 (15:25 -0700)]
Merge "Fix
2578016." into froyo
Christopher Tate [Wed, 7 Apr 2010 21:19:44 +0000 (14:19 -0700)]
Merge "Add Backup/Restore sample to the SDK docs" into froyo
Marco Nelissen [Wed, 7 Apr 2010 20:28:51 +0000 (13:28 -0700)]
Merge "Don't check whether a specific named activity supports mp3 playback, just that there is at least one that does. Fixes bug
2534382. Change-Id: I00d9ac49bd91f161388d5c3de47b1b6abe9e8d9c" into froyo
Ray Chen [Wed, 7 Apr 2010 19:05:58 +0000 (12:05 -0700)]
Merge "Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener
2553871" into froyo
Dianne Hackborn [Wed, 7 Apr 2010 18:49:37 +0000 (11:49 -0700)]
Merge "Maybe fix issue #
2568615: System server crashed in SyncStorageEngine" into froyo
Andreas Huber [Wed, 7 Apr 2010 17:58:05 +0000 (10:58 -0700)]
Merge "Report the requested seek time while seek is in progress." into froyo
Xia Wang [Wed, 7 Apr 2010 17:30:19 +0000 (10:30 -0700)]
Merge " Fix bug2537659 When airplane mode is disabled, Mobile connection may be bring up before connecting to a known wifi." into froyo
Leon Scroggins [Wed, 7 Apr 2010 17:04:50 +0000 (10:04 -0700)]
Merge "Show the microphone when the search box is opened from browser" into froyo
Adam Powell [Wed, 7 Apr 2010 16:48:48 +0000 (09:48 -0700)]
Merge "Fix bug
2574860 - fix AbsListView.trackMotionScroll edge detection" into froyo
Scott Main [Wed, 7 Apr 2010 16:02:59 +0000 (09:02 -0700)]
Merge "docs: add a screenLayout and uiMode values for configChanges attribute add note that this should be avoided and point to dev guide" into froyo
Daniel Sandler [Wed, 7 Apr 2010 13:40:26 +0000 (06:40 -0700)]
Merge "Add more WindowManager flags to ViewDebug." into froyo
Dan Egnor [Wed, 7 Apr 2010 03:50:25 +0000 (20:50 -0700)]
Merge "Comment-only change to clarify the role and use of IntentService" into froyo
Brett Chabot [Tue, 6 Apr 2010 23:31:14 +0000 (16:31 -0700)]
Merge "Add makefile so package manager test apks can get buitl from root." into froyo
Andreas Huber [Tue, 6 Apr 2010 21:43:05 +0000 (14:43 -0700)]
Merge "Partial revert of previous change to improve hardware AAC decoder performance, increasing the input buffer size so dramatically accidentally broke streaming performance." into froyo
Kenny Root [Tue, 6 Apr 2010 21:33:24 +0000 (14:33 -0700)]
Merge "Fix last character of password field being visible after rotation" into froyo
Daniel Lehmann [Tue, 6 Apr 2010 21:10:04 +0000 (14:10 -0700)]
Merge "Pass cookie to TOKEN_CONTACT_INFO so that QuickContact without photo works again Bug:
2572239" into froyo
Christopher Tate [Tue, 6 Apr 2010 19:19:11 +0000 (12:19 -0700)]
Merge "Fix 'bmgr restore'" into froyo
Grace Kloba [Tue, 6 Apr 2010 18:50:32 +0000 (11:50 -0700)]
Merge "Update the Webkit version." into froyo
Romain Guy [Tue, 6 Apr 2010 18:25:43 +0000 (11:25 -0700)]
Merge "Correctly resize dialogs when measured in WRAP_CONTENT Bug #
2549649" into froyo
Dianne Hackborn [Tue, 6 Apr 2010 18:18:01 +0000 (11:18 -0700)]
Merge "Fix issue #
2569139: Cannot login to last.fm after upgrade from Donut to FRF01B" into froyo
Suchi Amalapurapu [Tue, 6 Apr 2010 17:50:56 +0000 (10:50 -0700)]
Merge "Forcibly unmount the sdcard after N retries." into froyo
Bjorn Bringert [Tue, 6 Apr 2010 15:53:12 +0000 (08:53 -0700)]
Merge "Guard against NPE in SearchManagerService" into froyo
Joe Onorato [Tue, 6 Apr 2010 15:32:07 +0000 (08:32 -0700)]
Merge "Redo the look of the recent apps switcher" into froyo
Dianne Hackborn [Tue, 6 Apr 2010 01:35:11 +0000 (18:35 -0700)]
Merge "Fix issue #
2564479: Favorite Recipes App Installation Fail" into froyo
Jim Miller [Tue, 6 Apr 2010 00:16:00 +0000 (17:16 -0700)]
Merge "Fix
2325549: Allow up to 4 lines of summary text in Settings" into froyo
Dirk Dougherty [Mon, 5 Apr 2010 23:37:07 +0000 (16:37 -0700)]
Merge "docs: add manifest documentation for installLocation" into froyo
Wei Huang [Mon, 5 Apr 2010 22:36:40 +0000 (15:36 -0700)]
Merge "bug
2542580: fix bad icon." into froyo
Doug Zongker [Mon, 5 Apr 2010 22:16:12 +0000 (15:16 -0700)]
Merge "remove OTA packages from the old (pre-froyo) updater" into froyo
Dan Morrill [Mon, 5 Apr 2010 21:56:03 +0000 (14:56 -0700)]
Merge "Adding a feature definition for touchscreens that was overlooked in the last round." into froyo
Kenny Root [Mon, 5 Apr 2010 21:55:10 +0000 (14:55 -0700)]
Merge "Revert to previous text selection behavior" into froyo
Jaikumar Ganesh [Mon, 5 Apr 2010 21:45:27 +0000 (14:45 -0700)]
Merge "Add an extra for the Disconnect Headset State." into froyo
Wei Huang [Mon, 5 Apr 2010 21:36:47 +0000 (14:36 -0700)]
Merge "bug #
2542580: fix stat_notify_chat icon for mdpi resource." into froyo
Amith Yamasani [Mon, 5 Apr 2010 21:17:55 +0000 (14:17 -0700)]
Merge "Fix a crash in BatteryStatsImpl, due to a previous fix." into froyo
San Mehat [Mon, 5 Apr 2010 17:35:56 +0000 (10:35 -0700)]
Merge "NetworkManagementService: Combine setInterfaceRx/Tx throttle and add max speed" into froyo
Christopher Tate [Sat, 3 Apr 2010 02:14:58 +0000 (19:14 -0700)]
Merge "Fix "incall in landscape sometimes" bug #
2523942" into froyo
Dirk Dougherty [Sat, 3 Apr 2010 01:37:10 +0000 (18:37 -0700)]
Merge "doc change: miscellaneous small fixes." into froyo
Amith Yamasani [Sat, 3 Apr 2010 00:20:53 +0000 (17:20 -0700)]
Merge "Potential fix for bug:
2564824 : Device runtime restart in BatteryService" into froyo
Grace Kloba [Fri, 2 Apr 2010 23:41:13 +0000 (16:41 -0700)]
Merge "Make sure when WebView modified mScrollX/Y directly, onScrollChanged() is called so that the View system can do what it needs to adjust." into froyo
Andreas Huber [Fri, 2 Apr 2010 21:03:46 +0000 (14:03 -0700)]
Merge "Coalesce multiple encoded AAC frames into a single input buffer on this particular OMX codec to increase throughput significantly." into froyo
Dianne Hackborn [Fri, 2 Apr 2010 20:35:59 +0000 (13:35 -0700)]
Merge "Add a new intent category used for activities running in carmode." into froyo
Irfan Sheriff [Fri, 2 Apr 2010 19:47:45 +0000 (12:47 -0700)]
Merge "Dont start wifi if in airplane mode" into froyo
Suchi Amalapurapu [Fri, 2 Apr 2010 19:46:38 +0000 (12:46 -0700)]
Merge "Handle exceptions when doing dexopt." into froyo
Andreas Huber [Fri, 2 Apr 2010 18:18:32 +0000 (11:18 -0700)]
Merge "Support another kind of iso mpeg4 file." into froyo
Adam Powell [Fri, 2 Apr 2010 18:02:21 +0000 (11:02 -0700)]
Merge "Fix AbsListView scrolling behavior at edges." into froyo
Daniel Sandler [Fri, 2 Apr 2010 17:54:57 +0000 (10:54 -0700)]
Merge "Make desk mode work again." into froyo
Fred Quintana [Fri, 2 Apr 2010 17:47:11 +0000 (10:47 -0700)]
Merge "revert the stripping of System Group: from the names of google system groups" into froyo
Brett Chabot [Fri, 2 Apr 2010 17:24:00 +0000 (10:24 -0700)]
Merge "Add test annotations to frameworks common tests." into froyo
Grace Kloba [Fri, 2 Apr 2010 16:14:39 +0000 (09:14 -0700)]
Merge "Instead of holding an ApplicationContext, JWebCoreJavaBridge will have a reference of the current window's main WebView. It is only non-null if the WebView's window has the focus." into froyo
Jean-Michel Trivi [Fri, 2 Apr 2010 15:53:42 +0000 (08:53 -0700)]
Merge "Fix bug
2565463 Ensure an object cannot appear twice in the AudioFocus stack. Enforce parameter check in AudioManager.requestAudioFocus() Typo correction in AudioService.unregisterMediaButtonEventReceiver()" into froyo
Brett Chabot [Fri, 2 Apr 2010 15:53:22 +0000 (08:53 -0700)]
Add test annotations to frameworks common tests.
Change-Id: Iaf5af2cbd49015ac8f1bf23a4d20f055ac9a000e
Dave Sparks [Fri, 2 Apr 2010 14:56:44 +0000 (07:56 -0700)]
Merge "Use local lock for most MediaMetadataRetriever methods. Bug
2560834." into froyo
Brett Chabot [Fri, 2 Apr 2010 04:45:41 +0000 (21:45 -0700)]
Merge "More framework tests cleanup." into froyo
Mike Lockwood [Fri, 2 Apr 2010 04:08:53 +0000 (21:08 -0700)]
Merge "Vibrate before shutting down." into froyo
Mike LeBeau [Fri, 2 Apr 2010 01:11:43 +0000 (18:11 -0700)]
Merge "Use flattenToShortString instead of toShortString on ComponentNames to be sent in RecognizerIntent.EXTRA_CALLING_PACKAGE. This never should have been using toShortString because that includes curly braces and is not correctly parsed by ComponentName.unflattenFromString." into froyo
Charles Chen [Fri, 2 Apr 2010 00:56:47 +0000 (17:56 -0700)]
Merge "Fix for bug
2564771 - pitch setting between apps can interfere with one another." into froyo
Mike LeBeau [Thu, 1 Apr 2010 22:30:51 +0000 (15:30 -0700)]
Merge "Also send EXTRA_CALLING_PACKAGE for voice search intents that do web search (not just for in-app search). Needed as part of b/
2546173" into froyo
Gilles Debunne [Thu, 1 Apr 2010 21:47:00 +0000 (14:47 -0700)]
Merge "Refactor in PositionTesterContextMenuListener." into froyo
Brett Chabot [Thu, 1 Apr 2010 21:36:36 +0000 (14:36 -0700)]
Merge "Remove FrameworkTest package." into froyo
Fred Quintana [Thu, 1 Apr 2010 21:27:00 +0000 (14:27 -0700)]
Merge "allow null authtokens to invalidateAuthToken" into froyo
Dirk Dougherty [Thu, 1 Apr 2010 17:35:21 +0000 (10:35 -0700)]
Merge "doc change: cherry pick
75c66da20927e7e854397c00ef1974140270c57f. (clarify fill_parent/match_parent transition in ViewGroup.LayoutParams and R.attr. Mention match_parent in dev guide "declaring layout" doc.)" into froyo
James Dong [Thu, 1 Apr 2010 17:33:45 +0000 (10:33 -0700)]
Merge "Public API changes for CameraProfile and CamcorderProfile classes" into froyo
Robert Greenwalt [Thu, 1 Apr 2010 17:19:57 +0000 (10:19 -0700)]
Merge "NetworkManagementService: Add interface counters & throttle API" into froyo
Kristian Monsen [Thu, 1 Apr 2010 16:54:47 +0000 (09:54 -0700)]
Merge "Fix for bug
2558156: Encodig is null" into froyo
Ben Murdoch [Thu, 1 Apr 2010 15:42:14 +0000 (08:42 -0700)]
Merge changes Ic9531e3c,I3f04433b into froyo
* changes:
Cherry pick from master.
Cherry pick from master.
Grace Kloba [Thu, 1 Apr 2010 15:15:09 +0000 (08:15 -0700)]
Merge "As we don't support over scroll any more, we need to pin the (x,y) if we handle the drag after the plugin choose not to handle the event." into froyo
Eric Laurent [Thu, 1 Apr 2010 06:33:52 +0000 (23:33 -0700)]
Merge "Fix isssue
2548710: Native AudioTrack resources never freed." into froyo
Dianne Hackborn [Thu, 1 Apr 2010 06:04:22 +0000 (23:04 -0700)]
Merge "Fix issue #
2529154 Found SurfaceFlinger timeout in logcat when wake up Camcorder" into froyo
Dianne Hackborn [Thu, 1 Apr 2010 06:03:26 +0000 (23:03 -0700)]
Merge "Fix issue #
2560791: Expose API to go in to car mode." into froyo
Dianne Hackborn [Thu, 1 Apr 2010 05:49:30 +0000 (22:49 -0700)]
Merge "Fix issue #
2561067: Screen Display half faded..." into froyo
Xia Wang [Thu, 1 Apr 2010 03:29:10 +0000 (20:29 -0700)]
Merge "Test connecitvity manager functionality in state change. * Verify state change when enabling/disabling wifi * Verify network connectivity change while switching among 3G, Wifi, and Airplane mode" into froyo
Adam Powell [Thu, 1 Apr 2010 03:11:33 +0000 (20:11 -0700)]
Merge "Fix bug
2562240 and clean up scrollbar behavior" into froyo
Jaikumar Ganesh [Thu, 1 Apr 2010 01:36:35 +0000 (18:36 -0700)]
Merge "Fix crash while turning bluetooth on, due to a race condition." into froyo
Jeff Brown [Wed, 31 Mar 2010 22:56:30 +0000 (15:56 -0700)]
Merge "Fix alarms with negative or very large wakup times." into froyo
Jean-Michel Trivi [Wed, 31 Mar 2010 20:40:42 +0000 (13:40 -0700)]
Merge "Fix bug
2553575 API REVIEW: android.media Change 1 of 3 Notes from API Council review: Rename onAudioFocusChanged -> onAudioFocusChange" into froyo
Eric Laurent [Wed, 31 Mar 2010 19:21:17 +0000 (12:21 -0700)]
Fix isssue
2548710: Native AudioTrack resources never freed.
The problem is a bug in AudioFlinger::MixerThread::prepareTracks_l() that makes that even if the TrackHandle
is destroyed, the corresponding Track will remain active as long as frames are ready for mixing.
If the track uses shared memory (static mode) and the sound is looped, this track will play for ever.
The fix consists in removing the track from active list immediately if the track is terminated.
Change-Id: I4582aa1d981079ab79be442fb6185f5afaed5cf3
Andreas Huber [Wed, 31 Mar 2010 18:33:19 +0000 (11:33 -0700)]
Merge "Skip any number of leading ID3v2 tags (instead of just the first), also simplify/fix the find-consecutive-mp3-frames functionality." into froyo
Fred Quintana [Wed, 31 Mar 2010 18:01:41 +0000 (11:01 -0700)]
Merge "added a cleanspec since ActiveSyncInfo.aidl was removed" into froyo
Eric Olsen [Wed, 31 Mar 2010 17:04:24 +0000 (10:04 -0700)]
Merge "Add thermal shutdown. If battery temp >= 68C." into froyo
Andreas Huber [Wed, 31 Mar 2010 16:48:22 +0000 (09:48 -0700)]
Merge "Properly send a MEDIA_SEEK_COMPLETE notification for a seek request while paused (legacy behaviour)." into froyo
Robert Greenwalt [Wed, 31 Mar 2010 15:32:03 +0000 (08:32 -0700)]
Merge "Fix HttpProxy." into froyo
Dianne Hackborn [Wed, 31 Mar 2010 04:04:17 +0000 (21:04 -0700)]
Revert "fix [
2542425] memory leak during video recording"
This reverts commit
544592e14f8d7643238e40ba9879727497900f35.
Mathias Agopian [Tue, 30 Mar 2010 23:53:40 +0000 (16:53 -0700)]
fix [
2542425] memory leak during video recording
[Sorted|Keyed]Vector<TYPE> would leak their whole storage when resized
from the end and TYPE had trivial dtor and copy operators.
Change-Id: I8555bb1aa0863df72de27d67ae50e20706e90cf5
Mike Lockwood [Wed, 31 Mar 2010 00:29:41 +0000 (17:29 -0700)]
Merge "Add support for GPS privacy lock. DO NOT MERGE" into froyo
Daniel Lehmann [Tue, 30 Mar 2010 23:58:38 +0000 (16:58 -0700)]
Merge "Don't load photo if it's id is 0. Saves one database query Bug:
2546767" into froyo
Adam Powell [Tue, 30 Mar 2010 23:46:21 +0000 (16:46 -0700)]
Merge "Fix bug
2523622 - ListView invokes onItemClick for disabled adapter items" into froyo
Dianne Hackborn [Tue, 30 Mar 2010 22:55:37 +0000 (15:55 -0700)]
Merge "Fix issue #
2553553: API REVIEW: android.context.Context" into froyo