Irfan Sheriff
5cbb4dc9f7
Merge "Dont start wifi if in airplane mode" into froyo
2010-04-02 12:47:45 -07:00
Suchi Amalapurapu
eeb2f83f02
Merge "Handle exceptions when doing dexopt." into froyo
2010-04-02 12:46:38 -07:00
Andreas Huber
c8eafefc59
Merge "Support another kind of iso mpeg4 file." into froyo
2010-04-02 11:18:32 -07:00
Adam Powell
0538289113
Merge "Fix AbsListView scrolling behavior at edges." into froyo
2010-04-02 11:02:21 -07:00
Daniel Sandler
9e2cd9a4c0
Merge "Make desk mode work again." into froyo
2010-04-02 10:54:57 -07:00
Fred Quintana
51eeb54714
Merge "revert the stripping of System Group: from the names of google system groups" into froyo
2010-04-02 10:47:11 -07:00
Brett Chabot
c4a82edf66
Merge "Add test annotations to frameworks common tests." into froyo
2010-04-02 10:24:00 -07:00
Grace Kloba
4443e6ce77
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
2010-04-02 09:14:39 -07:00
Jean-Michel Trivi
4c9bf79786
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
2010-04-02 08:53:42 -07:00
Brett Chabot
49b35b5f9c
Add test annotations to frameworks common tests.
...
Change-Id: Iaf5af2cbd49015ac8f1bf23a4d20f055ac9a000e
2010-04-02 08:53:22 -07:00
Dave Sparks
8421672e2e
Merge "Use local lock for most MediaMetadataRetriever methods. Bug 2560834." into froyo
2010-04-02 07:56:44 -07:00
Brett Chabot
aabf8e227a
Merge "More framework tests cleanup." into froyo
2010-04-01 21:45:41 -07:00
Mike Lockwood
300bcd79d9
Merge "Vibrate before shutting down." into froyo
2010-04-01 21:08:53 -07:00
Mike LeBeau
6a569b5230
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
2010-04-01 18:11:43 -07:00
Charles Chen
71cc165645
Merge "Fix for bug 2564771 - pitch setting between apps can interfere with one another." into froyo
2010-04-01 17:56:47 -07:00
Mike LeBeau
4f44eece60
Merge "Also send EXTRA_CALLING_PACKAGE for voice search intents that do web search (not just for in-app search). Needed as part of http://b/2546173 " into froyo
2010-04-01 15:30:51 -07:00
Gilles Debunne
71475036eb
Merge "Refactor in PositionTesterContextMenuListener." into froyo
2010-04-01 14:47:00 -07:00
Brett Chabot
6d5e502c08
Merge "Remove FrameworkTest package." into froyo
2010-04-01 14:36:36 -07:00
Fred Quintana
43974e6e4e
Merge "allow null authtokens to invalidateAuthToken" into froyo
2010-04-01 14:27:00 -07:00
Dirk Dougherty
805fc9d373
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
2010-04-01 10:35:21 -07:00
James Dong
5bc3f94b99
Merge "Public API changes for CameraProfile and CamcorderProfile classes" into froyo
2010-04-01 10:33:45 -07:00
Robert Greenwalt
e146999bc8
Merge "NetworkManagementService: Add interface counters & throttle API" into froyo
2010-04-01 10:19:57 -07:00
Kristian Monsen
97ad6b7683
Merge "Fix for bug 2558156: Encodig is null" into froyo
2010-04-01 09:54:47 -07:00
Ben Murdoch
057779af45
Merge changes Ic9531e3c,I3f04433b into froyo
...
* changes:
Cherry pick from master.
Cherry pick from master.
2010-04-01 08:42:14 -07:00
Grace Kloba
b346d80e8c
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
2010-04-01 08:15:09 -07:00
Eric Laurent
09806e4578
Merge "Fix isssue 2548710: Native AudioTrack resources never freed." into froyo
2010-03-31 23:33:52 -07:00
Dianne Hackborn
ca85c03c8f
Merge "Fix issue #2529154 Found SurfaceFlinger timeout in logcat when wake up Camcorder" into froyo
2010-03-31 23:04:22 -07:00
Dianne Hackborn
678a358930
Merge "Fix issue #2560791 : Expose API to go in to car mode." into froyo
2010-03-31 23:03:26 -07:00
Dianne Hackborn
e651e76ee4
Merge "Fix issue #2561067 : Screen Display half faded..." into froyo
2010-03-31 22:49:30 -07:00
Xia Wang
55ae1b22e6
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
2010-03-31 20:29:10 -07:00
Adam Powell
aec2819346
Merge "Fix bug 2562240 and clean up scrollbar behavior" into froyo
2010-03-31 20:11:33 -07:00
Jaikumar Ganesh
dc03e510fe
Merge "Fix crash while turning bluetooth on, due to a race condition." into froyo
2010-03-31 18:36:35 -07:00
Jeff Brown
48bec69042
Merge "Fix alarms with negative or very large wakup times." into froyo
2010-03-31 15:56:30 -07:00
Jean-Michel Trivi
e4cdfce1be
Merge "Fix bug 2553575 API REVIEW: android.media Change 1 of 3 Notes from API Council review: Rename onAudioFocusChanged -> onAudioFocusChange" into froyo
2010-03-31 13:40:42 -07:00
Eric Laurent
deea502a92
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
2010-03-31 12:36:34 -07:00
Andreas Huber
54de5d19bc
Merge "Skip any number of leading ID3v2 tags (instead of just the first), also simplify/fix the find-consecutive-mp3-frames functionality." into froyo
2010-03-31 11:33:19 -07:00
Fred Quintana
30bc0f57cb
Merge "added a cleanspec since ActiveSyncInfo.aidl was removed" into froyo
2010-03-31 11:01:41 -07:00
Eric Olsen
c8e4213d9c
Merge "Add thermal shutdown. If battery temp >= 68C." into froyo
2010-03-31 10:04:24 -07:00
Andreas Huber
fffdeb00ae
Merge "Properly send a MEDIA_SEEK_COMPLETE notification for a seek request while paused (legacy behaviour)." into froyo
2010-03-31 09:48:22 -07:00
Robert Greenwalt
8aaf5a5113
Merge "Fix HttpProxy." into froyo
2010-03-31 08:32:03 -07:00
Dianne Hackborn
c85e12e075
Revert "fix [2542425] memory leak during video recording"
...
This reverts commit 544592e14f8d7643238e40ba9879727497900f35.
2010-03-30 21:04:17 -07:00
Mathias Agopian
77e26d6822
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
2010-03-30 19:02:59 -07:00
Mike Lockwood
964d29a953
Merge "Add support for GPS privacy lock. DO NOT MERGE" into froyo
2010-03-30 17:29:41 -07:00
Daniel Lehmann
53108f3901
Merge "Don't load photo if it's id is 0. Saves one database query Bug:2546767" into froyo
2010-03-30 16:58:38 -07:00
Adam Powell
07b8f00c47
Merge "Fix bug 2523622 - ListView invokes onItemClick for disabled adapter items" into froyo
2010-03-30 16:46:21 -07:00
Dianne Hackborn
48bcc5aa85
Merge "Fix issue #2553553 : API REVIEW: android.context.Context" into froyo
2010-03-30 15:55:37 -07:00
Andreas Huber
f6517d2d75
Merge "Properly fill in the component name for the software decoders." into froyo
2010-03-30 15:40:38 -07:00
Amith Yamasani
75713ec76b
Merge "Fix for Never not existing in latest timeout values." into froyo
2010-03-30 15:19:00 -07:00
Grace Kloba
3c21699f33
Merge "Remove the shadow under url bar." into froyo
2010-03-30 14:51:48 -07:00
Dianne Hackborn
b89603e391
Merge "Package manager optimizations." into froyo
2010-03-30 13:35:33 -07:00
