Kenny Root
bb87a93aff
Merge "Import revised translations" into froyo
2010-04-15 05:55:00 -07:00
Mike Lockwood
c1f32b0390
Merge "Fix wakelock leak in PowerManagerService.sendNotificationLocked()" into froyo
2010-04-15 05:45:21 -07:00
Robert Greenwalt
8ae5bf5e2c
Merge "Sholes mobile iface comes/goes - handle the reset" into froyo
2010-04-14 20:23:45 -07:00
Dianne Hackborn
62636a7ae5
Merge "Fix issue #258640 : Automatic propagation of FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET" into froyo
2010-04-14 19:02:00 -07:00
Dmitri Plotnikov
d3f849b4e1
Merge "Introducing "strict project map"." into froyo
2010-04-14 18:33:54 -07:00
Suchi Amalapurapu
a8b0ff4840
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
2010-04-14 18:28:22 -07:00
Mathias Agopian
90e479389b
Merge "fix [2594950] Flash: Zooming in on some content crashes the Nexus One and causes it to reboot (runtime restart)" into froyo
2010-04-14 18:18:44 -07:00
Suchi Amalapurapu
d58d8f6453
Merge "Add ordered broadcast when removing packages." into froyo
2010-04-14 18:11:34 -07:00
Mathias Agopian
ca99fb8f65
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
2010-04-14 16:43:44 -07:00
Vasu Nori
661bc51cbb
Merge "verify database state before calling sqlite. Bug:2593970" into froyo
2010-04-14 15:53:43 -07:00
Grace Kloba
218aa6b818
Merge "Pass WebKit scrollbar mode to Java. When scrollbar is alwaysOff, don't trigger scroll." into froyo
2010-04-14 12:44:05 -07:00
The Android Automerger
71b84c923a
Merge branch 'froyo' into froyo-release
2010-04-14 11:28:26 -07:00
Eric Laurent
8155b783fa
Merge "Fix issue 2589563: Able to set ringer volume to 0 outside of silent mode." into froyo
2010-04-14 10:39:32 -07:00
Andrei Popescu
41ac20f22f
Merge "Make sure the onended event is dispatched even when the user dismisses the video before it plays to completion." into froyo
2010-04-14 10:26:58 -07:00
Dianne Hackborn
b1016fe1f2
Merge "Fix issue #593153 : Broadcast time out when sending..." into froyo
2010-04-14 10:16:35 -07:00
James Dong
685bc905d9
Merge "Use PV_PLAYER to handle RTSP streaming" into froyo
2010-04-14 09:59:33 -07:00
Robert Greenwalt
281cec9ffb
Merge "Perist Throttle data across reboots" into froyo
2010-04-14 09:07:25 -07:00
Leon Scroggins
c566beb7bb
Merge "Ensure the selection does not change in setTextAndKeepSelection." into froyo
2010-04-14 06:42:20 -07:00
Kristian Monsen
e56943a535
Merge "Fix for 2585858, load invalid urls." into froyo
2010-04-14 02:22:18 -07:00
Kristian Monsen
43229f29c9
Merge "Fix (again) for bug 2558156, update cache encoding correctly" into froyo
2010-04-14 02:22:05 -07:00
Dianne Hackborn
c308249487
Merge "Fix issue #2555171 : Switching to app immediately after unmounting..." into froyo
2010-04-13 18:07:27 -07:00
Dianne Hackborn
9f73495714
Merge "Fix issue #2420340 : if FLAG_SHOW_WHEN_LOCKED, do not show keyguard..." into froyo
2010-04-13 17:57:23 -07:00
Grace Kloba
b914ed29c1
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
2010-04-13 17:20:29 -07:00
James Dong
abc56d75be
Merge "Snif more 3GPP file types according to http://www.ftyps.com/3gpp.html " into froyo
2010-04-13 15:34:20 -07:00
Suchi Amalapurapu
70bff6c129
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
2010-04-13 15:30:07 -07:00
Robert Greenwalt
2a75ab0da5
Merge "Fix Throttle Notification intents" into froyo
2010-04-13 15:22:00 -07:00
Christopher Tate
e5c64a9003
Merge "SDK: last of the backup/restore docs content" into froyo
2010-04-13 14:21:48 -07:00
Andreas Huber
daeec8c5b3
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
2010-04-13 12:16:08 -07:00
James Dong
ce95b94082
Merge "Don't set encoder component role while we query decoders" into froyo
2010-04-13 12:11:57 -07:00
Amith Yamasani
f05a8854ce
Merge "Fix an upgrade bug in SettingsProvider." into froyo
2010-04-13 10:05:27 -07:00
Jean-Michel Trivi
35f3a77b07
Merge "Fix bug 2578813 Delay pausing music and routing audio for car docks" into froyo
2010-04-13 09:53:35 -07:00
The Android Automerger
02b0fa7f9b
Merge branch 'froyo' into froyo-release
2010-04-13 08:07:56 -07:00
Daniel Sandler
5d89658b21
Merge "Hide e-call button in layout." into froyo
2010-04-13 06:00:02 -07:00
Andreas Huber
692dc8a970
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
2010-04-12 17:15:32 -07:00
Christopher Tate
f8654c9278
Merge "SDK: more backup/restore documentation work" into froyo
2010-04-12 16:14:53 -07:00
Scott Main
e8cfa791e3
Merge "docs: fix bug 2590728" into froyo
2010-04-12 16:09:28 -07:00
The Android Automerger
134de466f3
Merge branch 'froyo' into froyo-release
2010-04-12 15:45:33 -07:00
Christopher Tate
5bc83acfd3
Merge "API CHANGE: remove obsolete constants and hide some methods" into froyo
2010-04-12 15:13:35 -07:00
Andreas Huber
0e8ff0cb11
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
2010-04-12 14:16:34 -07:00
Kenny Root
e85658ea34
Merge "Fix typos in name of density-independent pixels" into froyo
2010-04-12 12:19:08 -07:00
Jean-Michel Trivi
44eddf8514
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
2010-04-12 12:05:08 -07:00
Andreas Huber
128cbf2812
Merge "Fix a case where the aac hardware decoder is in a transition state and refused a fillbuffer request." into froyo
2010-04-12 11:02:27 -07:00
Andreas Huber
66143c02c1
Merge "Ignore corrupt aac audio frames and substitute silence." into froyo
2010-04-12 10:11:32 -07:00
The Android Automerger
6b1acbe384
Merge branch 'froyo' into froyo-release
2010-04-12 09:45:31 -07:00
Scott Main
7765c25dfa
Merge "cherry-pick from master: Icf079f5f45b1745a8d54f504e28dbbb52c6f7c96 docs: rewrite resources documentation" into froyo
2010-04-09 17:03:55 -07:00
Dianne Hackborn
45888b7200
Merge "Fix issue #2581524 : Car home icon should always go to car home" into froyo
2010-04-09 16:52:41 -07:00
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
