OSDN Git Service
Scott Main [Mon, 19 Apr 2010 19:28:15 +0000 (12:28 -0700)]
Merge "add droiddoc flag to include since-tags for api level 8" into froyo
Brad Fitzpatrick [Mon, 19 Apr 2010 19:17:48 +0000 (12:17 -0700)]
Merge "Reduce lock contention, removing unnecessary synchronization." into froyo
Grace Kloba [Mon, 19 Apr 2010 19:14:41 +0000 (12:14 -0700)]
Merge "Force redraw in touch_up if there is a move." into froyo
Brad Fitzpatrick [Mon, 19 Apr 2010 18:50:53 +0000 (11:50 -0700)]
Merge "Ease contention on the mProcessStatsThread mutex in updateCpuStats." into froyo
Irfan Sheriff [Mon, 19 Apr 2010 16:50:37 +0000 (09:50 -0700)]
Merge "Reset notification state on wifi enable" into froyo
Jean-Michel Trivi [Mon, 19 Apr 2010 16:41:19 +0000 (09:41 -0700)]
Merge "Fix bug
2599698 Music paused by itself The NotificationPlayer sets an OnCompletionListener on the MediaPlayer it's using to play the notification. NotificationPlayer relies on the completion event to abandon audio focus. The player was started before the listener was set. The theory about the bug is that the player finished playing before the listener was called. Therefore the audio focus was never abandonned, and the music didn't resume." into froyo
Mike Lockwood [Mon, 19 Apr 2010 15:18:58 +0000 (08:18 -0700)]
Merge "Fix inconsistency in how we handle light sensor when battery is low." into froyo
Irfan Sheriff [Sat, 17 Apr 2010 16:27:25 +0000 (09:27 -0700)]
Merge "Dont check on interface value on API" into froyo
Grace Kloba [Fri, 16 Apr 2010 23:34:43 +0000 (16:34 -0700)]
Merge "Missed a case to resumeUpdatePicture." into froyo
Scott Main [Fri, 16 Apr 2010 23:14:33 +0000 (16:14 -0700)]
Merge "cherry-pick from master:
c096a9aead60717fc106ceb259bf954a578d3c54 (plus other revisions to resolve bug
2595831)" into froyo
Vasu Nori [Fri, 16 Apr 2010 21:48:47 +0000 (14:48 -0700)]
Merge "accept close() on database objects even if the database is closed" into froyo
Carl Shapiro [Fri, 16 Apr 2010 20:25:03 +0000 (13:25 -0700)]
Merge "Add command line flags to enable lock profiling." into froyo
Mike LeBeau [Fri, 16 Apr 2010 14:23:12 +0000 (07:23 -0700)]
Merge "For search suggestions in the search dialog, allow the 'title' line of text to be up to 2 lines (rather than the usual 1) if no 'description' line is provided." into froyo
Robert Greenwalt [Fri, 16 Apr 2010 00:37:55 +0000 (17:37 -0700)]
Merge "Add multi-sim support to ThrottleService." into froyo
Dianne Hackborn [Thu, 15 Apr 2010 20:33:21 +0000 (13:33 -0700)]
Merge "A little more improvement of the Service javadoc." into froyo
Robert Greenwalt [Thu, 15 Apr 2010 20:28:43 +0000 (13:28 -0700)]
Merge "Fix SntpClient to give accurate time info." into froyo
Kenny Root [Thu, 15 Apr 2010 12:55:00 +0000 (05:55 -0700)]
Merge "Import revised translations" into froyo
Mike Lockwood [Thu, 15 Apr 2010 12:45:21 +0000 (05:45 -0700)]
Merge "Fix wakelock leak in PowerManagerService.sendNotificationLocked()" into froyo
Robert Greenwalt [Thu, 15 Apr 2010 03:23:45 +0000 (20:23 -0700)]
Merge "Sholes mobile iface comes/goes - handle the reset" into froyo
Dianne Hackborn [Thu, 15 Apr 2010 02:02:00 +0000 (19:02 -0700)]
Merge "Fix issue #258640: Automatic propagation of FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET" into froyo
Dmitri Plotnikov [Thu, 15 Apr 2010 01:33:54 +0000 (18:33 -0700)]
Merge "Introducing "strict project map"." into froyo
Suchi Amalapurapu [Thu, 15 Apr 2010 01:28:22 +0000 (18:28 -0700)]
Merge "Dont fall back to installing on sdcard when internal storage is filled up when the install location is set to internal only. Similary if install location is set to external only(via adb), dont fall back to installing on internal storage if sdcard is filled up. If nothing is specified ie install location is set to let system decide, we just check on internal storage. Fix tests" into froyo
Mathias Agopian [Thu, 15 Apr 2010 01:18:44 +0000 (18:18 -0700)]
Merge "fix [
2594950] Flash: Zooming in on some content crashes the Nexus One and causes it to reboot (runtime restart)" into froyo
Suchi Amalapurapu [Thu, 15 Apr 2010 01:11:34 +0000 (18:11 -0700)]
Merge "Add ordered broadcast when removing packages." into froyo
Mathias Agopian [Wed, 14 Apr 2010 23:43:44 +0000 (16:43 -0700)]
fix [
2594950] Flash: Zooming in on some content crashes the Nexus One and causes it to reboot (runtime restart)
We now limit the size of the surface to the maximum size supported by the GPU.
On Nexus One this will 2048 -- it could be different on other devices.
Surface creation fails if the limit is exceeded.
Change-Id: I9ecfc2e9c58c9e283782b61ebfc6b590f71df785
Vasu Nori [Wed, 14 Apr 2010 22:53:43 +0000 (15:53 -0700)]
Merge "verify database state before calling sqlite. Bug:
2593970" into froyo
Grace Kloba [Wed, 14 Apr 2010 19:44:05 +0000 (12:44 -0700)]
Merge "Pass WebKit scrollbar mode to Java. When scrollbar is alwaysOff, don't trigger scroll." into froyo
Eric Laurent [Wed, 14 Apr 2010 17:39:32 +0000 (10:39 -0700)]
Merge "Fix issue
2589563: Able to set ringer volume to 0 outside of silent mode." into froyo
Andrei Popescu [Wed, 14 Apr 2010 17:26:58 +0000 (10:26 -0700)]
Merge "Make sure the onended event is dispatched even when the user dismisses the video before it plays to completion." into froyo
Dianne Hackborn [Wed, 14 Apr 2010 17:16:35 +0000 (10:16 -0700)]
Merge "Fix issue #593153: Broadcast time out when sending..." into froyo
James Dong [Wed, 14 Apr 2010 16:59:33 +0000 (09:59 -0700)]
Merge "Use PV_PLAYER to handle RTSP streaming" into froyo
Robert Greenwalt [Wed, 14 Apr 2010 16:07:25 +0000 (09:07 -0700)]
Merge "Perist Throttle data across reboots" into froyo
Leon Scroggins [Wed, 14 Apr 2010 13:42:20 +0000 (06:42 -0700)]
Merge "Ensure the selection does not change in setTextAndKeepSelection." into froyo
Kristian Monsen [Wed, 14 Apr 2010 09:22:18 +0000 (02:22 -0700)]
Merge "Fix for
2585858, load invalid urls." into froyo
Kristian Monsen [Wed, 14 Apr 2010 09:22:05 +0000 (02:22 -0700)]
Merge "Fix (again) for bug
2558156, update cache encoding correctly" into froyo
Dianne Hackborn [Wed, 14 Apr 2010 01:07:27 +0000 (18:07 -0700)]
Merge "Fix issue #
2555171: Switching to app immediately after unmounting..." into froyo
Dianne Hackborn [Wed, 14 Apr 2010 00:57:23 +0000 (17:57 -0700)]
Merge "Fix issue #
2420340: if FLAG_SHOW_WHEN_LOCKED, do not show keyguard..." into froyo
Grace Kloba [Wed, 14 Apr 2010 00:20:29 +0000 (17:20 -0700)]
Merge "If we defer processing the touch events, pass the original view coordinate with TouchEventData and use them when we reprocess the events. We can't depend on contentToView() to convert the doc point to the view point. When we originally convert the view to doc, the scroll position in UI doesn't change. When we convert the doc back to view, we are chasing a moving target. That is why we saw bigger delta." into froyo
James Dong [Tue, 13 Apr 2010 22:34:20 +0000 (15:34 -0700)]
Merge "Snif more 3GPP file types according to ftyps.com/3gpp.html" into froyo
Suchi Amalapurapu [Tue, 13 Apr 2010 22:30:07 +0000 (15:30 -0700)]
Merge "Fix crashes related to unmounting when app on sdcard has an active notification in status bar. When unmounting sdcard, all the secure containers have to be unmounted first before invoking the MountService call back. We send a broadcast about disabled packages. Force a gc to clean up any stale asset references and then unmount the containers before invoking the MountService call back." into froyo
Robert Greenwalt [Tue, 13 Apr 2010 22:22:00 +0000 (15:22 -0700)]
Merge "Fix Throttle Notification intents" into froyo
Christopher Tate [Tue, 13 Apr 2010 21:21:48 +0000 (14:21 -0700)]
Merge "SDK: last of the backup/restore docs content" into froyo
Andreas Huber [Tue, 13 Apr 2010 19:16:08 +0000 (12:16 -0700)]
Merge "Better diagnostics in the stagefright commandline tool, support for playing sine-tones using a filename of "sine:[samplingrate]", i.e. sine:44100. Support for playing audio through to the speakers by using "-o" in addition to "-a"." into froyo
James Dong [Tue, 13 Apr 2010 19:11:57 +0000 (12:11 -0700)]
Merge "Don't set encoder component role while we query decoders" into froyo
Amith Yamasani [Tue, 13 Apr 2010 17:05:27 +0000 (10:05 -0700)]
Merge "Fix an upgrade bug in SettingsProvider." into froyo
Jean-Michel Trivi [Tue, 13 Apr 2010 16:53:35 +0000 (09:53 -0700)]
Merge "Fix bug
2578813 Delay pausing music and routing audio for car docks" into froyo
Daniel Sandler [Tue, 13 Apr 2010 13:00:02 +0000 (06:00 -0700)]
Merge "Hide e-call button in layout." into froyo
Andreas Huber [Tue, 13 Apr 2010 00:15:32 +0000 (17:15 -0700)]
Merge "Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we don't have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks." into froyo
Christopher Tate [Mon, 12 Apr 2010 23:14:53 +0000 (16:14 -0700)]
Merge "SDK: more backup/restore documentation work" into froyo
Scott Main [Mon, 12 Apr 2010 23:09:28 +0000 (16:09 -0700)]
Merge "docs: fix bug
2590728" into froyo
Christopher Tate [Mon, 12 Apr 2010 22:13:35 +0000 (15:13 -0700)]
Merge "API CHANGE: remove obsolete constants and hide some methods" into froyo
Andreas Huber [Mon, 12 Apr 2010 21:16:34 +0000 (14:16 -0700)]
Merge "Fix a race condition in TimedEventQueue, an event may be cancelled while we're waiting for its scheduled time to come in which case we'd be removing it from the queue twice." into froyo
Kenny Root [Mon, 12 Apr 2010 19:19:08 +0000 (12:19 -0700)]
Merge "Fix typos in name of density-independent pixels" into froyo
Jean-Michel Trivi [Mon, 12 Apr 2010 19:05:08 +0000 (12:05 -0700)]
Merge "Fix monkey bug
2586534 java.util.ConcurrentModificationException Unlike the other audio focus and media button stack handling methods, abandonAudioFocus() and unregisterAudioFocusClient() were not synchronized around their focus stack. This CL corrects this." into froyo
Andreas Huber [Mon, 12 Apr 2010 18:02:27 +0000 (11:02 -0700)]
Merge "Fix a case where the aac hardware decoder is in a transition state and refused a fillbuffer request." into froyo
Andreas Huber [Mon, 12 Apr 2010 17:11:32 +0000 (10:11 -0700)]
Merge "Ignore corrupt aac audio frames and substitute silence." into froyo
Scott Main [Sat, 10 Apr 2010 00:03:55 +0000 (17:03 -0700)]
Merge "cherry-pick from master: Icf079f5f45b1745a8d54f504e28dbbb52c6f7c96 docs: rewrite resources documentation" into froyo
Dianne Hackborn [Fri, 9 Apr 2010 23:52:41 +0000 (16:52 -0700)]
Merge "Fix issue #
2581524: Car home icon should always go to car home" into froyo
Robert Greenwalt [Fri, 9 Apr 2010 23:47:10 +0000 (16:47 -0700)]
Merge "Add warning magic to be a bit more reasonable." into froyo
Yu Shan Emily Lau [Fri, 9 Apr 2010 23:41:37 +0000 (16:41 -0700)]
Merge "Remove the checkStremingServer checking as it is unstable and introduce the flakiness." into froyo
Romain Guy [Fri, 9 Apr 2010 23:08:17 +0000 (16:08 -0700)]
Merge "Fix regression introduced when fixing focus issue with ScrollView. Bug #
2581646" into froyo
Wink Saville [Fri, 9 Apr 2010 22:39:33 +0000 (15:39 -0700)]
Merge "Fix a FATAL ClassCastException in DataConnection.java" into froyo
Wei Huang [Fri, 9 Apr 2010 22:34:46 +0000 (15:34 -0700)]
Merge "bug #
2542580: add the appropriate mdpi asset for chat icon." into froyo
Jesse Wilson [Fri, 9 Apr 2010 21:01:07 +0000 (14:01 -0700)]
Merge "Move the public method HttpDateTime.parse() into AndroidHttpClient." into froyo
Jesse Wilson [Thu, 8 Apr 2010 21:20:57 +0000 (14:20 -0700)]
Move the public method HttpDateTime.parse() into AndroidHttpClient.
See bug http://b/
2553589
Change-Id: Ide3399c7c63daf9c0b8c18669076f2f4d6e9a876
Mike Reed [Fri, 9 Apr 2010 20:10:07 +0000 (13:10 -0700)]
Merge "final versions of these fonts from ascender, including GPOS 'mark' feature" into froyo
Robert Greenwalt [Fri, 9 Apr 2010 20:00:05 +0000 (13:00 -0700)]
Merge "Make ThrottleService notice policy changes." into froyo
Dan Egnor [Fri, 9 Apr 2010 19:50:11 +0000 (12:50 -0700)]
Merge "Fix sim build (sim doesn't have strl*() reliably...)" into froyo
Kristian Monsen [Fri, 9 Apr 2010 17:59:20 +0000 (10:59 -0700)]
Merge "Do not create intents for application/xhtml+xml" into froyo
Grace Kloba [Fri, 9 Apr 2010 17:49:42 +0000 (10:49 -0700)]
Merge "Set mHeldMotionless to a new MOTIONLESS_IGNORE state for fling, this way we will trigger animateScroll during fling for the faster performance. We also avoid keep removing/sending DRAG_HELD_MOTIONLESS message during fling." into froyo
Robert Greenwalt [Fri, 9 Apr 2010 16:29:20 +0000 (09:29 -0700)]
Merge "Roaming data doesn't count against limits" into froyo
Eric Laurent [Fri, 9 Apr 2010 15:48:32 +0000 (08:48 -0700)]
Merge "Additional fix for isssue
2548710: Native AudioTrack resources never freed." into froyo
Andreas Huber [Fri, 9 Apr 2010 14:01:58 +0000 (07:01 -0700)]
Merge "Support for ID3 V2.4 tags." into froyo
Eric Laurent [Fri, 9 Apr 2010 13:11:48 +0000 (06:11 -0700)]
Additional fix for isssue
2548710: Native AudioTrack resources never freed.
This changes fixes the issue for the direct output thread that was not
addressed by commit
71f37cd8a175ee00635cb91506d6810fd02b5b51.
Change-Id: I1bbe26be5f444415dd97270e49257650f5d2858f
Dan Egnor [Fri, 9 Apr 2010 00:38:28 +0000 (17:38 -0700)]
Merge "Fix OperationScheduler moratorium calculation for clock rollback case." into froyo
Dan Egnor [Fri, 9 Apr 2010 00:24:26 +0000 (17:24 -0700)]
Fix OperationScheduler moratorium calculation for clock rollback case.
Make the unit test exercise some clock-rollback scenarios, using
a properly injected artificial clock.
Bug:
2579585
Change-Id: I6f81c32318ba27429bd30ff53b48449218e4ac64
Xavier Ducrohet [Fri, 9 Apr 2010 00:29:39 +0000 (17:29 -0700)]
Merge "Adds back the finalize method on the replaced Paint class." into froyo
Jeff Brown [Fri, 9 Apr 2010 00:18:15 +0000 (17:18 -0700)]
Merge "Remove @link to hidden ACCESS_CACHE_FILESYSTEM permission." into froyo
Jeff Brown [Thu, 8 Apr 2010 23:41:47 +0000 (16:41 -0700)]
Merge "Workaround NPE caused by packages missing signatures." into froyo
Jeff Brown [Thu, 8 Apr 2010 23:41:37 +0000 (16:41 -0700)]
Merge "Improve robustness of package manager certificate collection." into froyo
Brett Chabot [Thu, 8 Apr 2010 23:36:02 +0000 (16:36 -0700)]
Merge "IME test fixes." into froyo
Robert Greenwalt [Thu, 8 Apr 2010 23:09:31 +0000 (16:09 -0700)]
Merge "Updating some notificiation UI for Throttling" into froyo
Dan Egnor [Thu, 8 Apr 2010 21:45:07 +0000 (14:45 -0700)]
Merge "Change TrafficStats to a new JNI implementation." into froyo
Dan Egnor [Thu, 8 Apr 2010 21:10:50 +0000 (14:10 -0700)]
Merge "Missed these ones in the previous rename." into froyo
Grace Kloba [Thu, 8 Apr 2010 21:05:05 +0000 (14:05 -0700)]
Merge "For performance reason, we choose to block the picture update during drag and fling. For sites like nytimes.com, there is a JavaScript constantly updating the content. If we don't block the live update during drag/fling, frame rate can drop by 30%." into froyo
Brad Fitzpatrick [Thu, 8 Apr 2010 21:01:23 +0000 (14:01 -0700)]
Merge "Rename logtag for clarity." into froyo
Andreas Huber [Thu, 8 Apr 2010 19:44:33 +0000 (12:44 -0700)]
Merge "Refactor connection/redirection code, support redirects on reconnection." into froyo
Robert Greenwalt [Thu, 8 Apr 2010 19:42:09 +0000 (12:42 -0700)]
Merge "Add service to monitor/control the flow of data." into froyo
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