Robert Greenwalt
533ebe2173
Merge "Add warning magic to be a bit more reasonable." into froyo
2010-04-09 16:47:10 -07:00
Yu Shan Emily Lau
22cbafc589
Merge "Remove the checkStremingServer checking as it is unstable and introduce the flakiness." into froyo
2010-04-09 16:41:37 -07:00
Romain Guy
3d436720d2
Merge "Fix regression introduced when fixing focus issue with ScrollView. Bug #2581646 " into froyo
2010-04-09 16:08:17 -07:00
Wink Saville
1a34d6c86d
Merge "Fix a FATAL ClassCastException in DataConnection.java" into froyo
2010-04-09 15:39:33 -07:00
Wei Huang
c3af71c8fd
Merge "bug #2542580 : add the appropriate mdpi asset for chat icon." into froyo
2010-04-09 15:34:46 -07:00
Jesse Wilson
533d354621
Merge "Move the public method HttpDateTime.parse() into AndroidHttpClient." into froyo
2010-04-09 14:01:07 -07:00
Jesse Wilson
fd472ba92c
Move the public method HttpDateTime.parse() into AndroidHttpClient.
...
See bug http://b/2553589
Change-Id: Ide3399c7c63daf9c0b8c18669076f2f4d6e9a876
2010-04-09 13:34:15 -07:00
Mike Reed
75716915d0
Merge "final versions of these fonts from ascender, including GPOS 'mark' feature" into froyo
2010-04-09 13:10:07 -07:00
Robert Greenwalt
9169ebd2d3
Merge "Make ThrottleService notice policy changes." into froyo
2010-04-09 13:00:05 -07:00
Dan Egnor
291444fdb6
Merge "Fix sim build (sim doesn't have strl*() reliably...)" into froyo
2010-04-09 12:50:11 -07:00
Kristian Monsen
276ed8df4f
Merge "Do not create intents for application/xhtml+xml" into froyo
2010-04-09 10:59:20 -07:00
Grace Kloba
51053fda45
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
2010-04-09 10:49:42 -07:00
Robert Greenwalt
e304ba1219
Merge "Roaming data doesn't count against limits" into froyo
2010-04-09 09:29:21 -07:00
Eric Laurent
376f728b35
Merge "Additional fix for isssue 2548710: Native AudioTrack resources never freed." into froyo
2010-04-09 08:48:32 -07:00
Andreas Huber
248281006b
Merge "Support for ID3 V2.4 tags." into froyo
2010-04-09 07:01:58 -07:00
Eric Laurent
775fa3cd32
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
2010-04-09 06:11:48 -07:00
Dan Egnor
35c1a2dc1f
Merge "Fix OperationScheduler moratorium calculation for clock rollback case." into froyo
2010-04-08 17:38:28 -07:00
Dan Egnor
66424a44c5
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
2010-04-08 17:30:37 -07:00
Xavier Ducrohet
a540ed0064
Merge "Adds back the finalize method on the replaced Paint class." into froyo
2010-04-08 17:29:39 -07:00
Jeff Brown
7710cd4c35
Merge "Remove @link to hidden ACCESS_CACHE_FILESYSTEM permission." into froyo
2010-04-08 17:18:15 -07:00
Jeff Brown
62737b55d2
Merge "Workaround NPE caused by packages missing signatures." into froyo
2010-04-08 16:41:47 -07:00
Jeff Brown
20460cfc7d
Merge "Improve robustness of package manager certificate collection." into froyo
2010-04-08 16:41:37 -07:00
Brett Chabot
399d2f06da
Merge "IME test fixes." into froyo
2010-04-08 16:36:02 -07:00
Robert Greenwalt
8e1b0077ad
Merge "Updating some notificiation UI for Throttling" into froyo
2010-04-08 16:09:31 -07:00
Dan Egnor
efdccf3ebb
Merge "Change TrafficStats to a new JNI implementation." into froyo
2010-04-08 14:45:07 -07:00
Dan Egnor
2728e5f544
Merge "Missed these ones in the previous rename." into froyo
2010-04-08 14:10:50 -07:00
Grace Kloba
b2a21d6ac3
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
2010-04-08 14:05:05 -07:00
Brad Fitzpatrick
b56b5fd4fc
Merge "Rename logtag for clarity." into froyo
2010-04-08 14:01:23 -07:00
Andreas Huber
d85bfb3a14
Merge "Refactor connection/redirection code, support redirects on reconnection." into froyo
2010-04-08 12:44:33 -07:00
Robert Greenwalt
98b863760c
Merge "Add service to monitor/control the flow of data." into froyo
2010-04-08 12:42:09 -07:00
Dianne Hackborn
be4143d514
Merge "Fix issue #2580316 : Contacts and Phone app not supporting landscape mode..." into froyo
2010-04-08 11:35:27 -07:00
Scott Main
436aa0ff9c
Merge "docs: revisions to the installLocation documentation" into froyo
2010-04-08 11:22:42 -07:00
Jaikumar Ganesh
6b4e57141f
Merge "Don't allow connection to profiles in TURNING_OFF state." into froyo
2010-04-08 10:01:50 -07:00
Andrei Popescu
95ecb699b0
Merge "Avoid calling proxy.playbackEnded() again in onCustomViewHidden(). It is now always called via the MediaPlayer.onCompletion() callback." into froyo
2010-04-08 09:07:32 -07:00
The Android Automerger
617cd2cef5
Merge branch 'froyo' into froyo-release
2010-04-08 08:27:21 -07:00
Andreas Huber
fd1a82638c
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
2010-04-08 08:27:20 -07:00
Daniel Sandler
c75afb3e8a
Merge "Transparent alarm icons for lockscreen." into froyo
2010-04-08 06:07:57 -07:00
Daniel Sandler
81ce80eb67
Merge "Add emergency call button to PUK'd lockscreen." into froyo
2010-04-08 06:06:50 -07:00
Suchi Amalapurapu
de14d8f178
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
2010-04-07 21:24:36 -07:00
Grace Kloba
3d339a93b9
Merge "Revert "Use the content width to calculate the zoom overview"" into froyo
2010-04-07 18:57:52 -07:00
Dianne Hackborn
aba899bb7d
Merge "Fix issue #2549955 : Moving the application fails -Activity Manager Crash on launching the app" into froyo
2010-04-07 18:37:04 -07:00
Dianne Hackborn
0f606ea702
Merge "Fix issue #2528537 : android.os.DeadObjectException" into froyo
2010-04-07 18:31:06 -07:00
Grace Kloba
2768afff40
Merge "Cherry-pick https://android-git.corp.google.com/g/#change,38305 " into froyo
2010-04-07 18:18:17 -07:00
John Wang
0a8cf0b36b
Merge "Add emergencyOnly indicator in ServiceState." into froyo
2010-04-07 17:51:41 -07:00
San Mehat
25d9df20a2
Merge "NetworkManagementService: Remove 'maxkbs' parameter from throttle API" into froyo
2010-04-07 15:32:44 -07:00
Suchi Amalapurapu
60e514bfb4
Merge "Fix 2578016." into froyo
2010-04-07 15:25:51 -07:00
Christopher Tate
727b5ff4e6
Merge "Add Backup/Restore sample to the SDK docs" into froyo
2010-04-07 14:19:44 -07:00
Marco Nelissen
138da33e45
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
2010-04-07 13:28:51 -07:00
Ray Chen
5560ff353d
Merge "Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener http://2553871 " into froyo
2010-04-07 12:05:58 -07:00
Dianne Hackborn
e098fb12b8
Merge "Maybe fix issue #2568615 : System server crashed in SyncStorageEngine" into froyo
2010-04-07 11:49:37 -07:00