Commit Graph

14255 Commits

Author SHA1 Message Date
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
b955d51032 am 40b6996a: Merge "Add ordered broadcast when removing packages." into froyo
Merge commit '40b6996a8fb7da131e8b91453b08e292723662be' into froyo-plus-aosp

* commit '40b6996a8fb7da131e8b91453b08e292723662be':
  Add ordered broadcast when removing packages.
2010-04-14 18:15:31 -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
773dbcc0a0 am 0bbcdc6c: Merge "verify database state before calling sqlite. Bug:2593970" into froyo
Merge commit '0bbcdc6c5f609eeb38b8f1305e529c42bf6f9a63' into froyo-plus-aosp

* commit '0bbcdc6c5f609eeb38b8f1305e529c42bf6f9a63':
  verify database state before calling sqlite. Bug:2593970
2010-04-14 16:27:04 -07:00
Grace Kloba
58ab590bc5 am 8a878dde: Merge "Pass WebKit scrollbar mode to Java. When scrollbar is alwaysOff, don\'t trigger scroll." into froyo
Merge commit '8a878dde9d15f75446bb5ca3137fccef8426ddd7' into froyo-plus-aosp

* commit '8a878dde9d15f75446bb5ca3137fccef8426ddd7':
  Pass WebKit scrollbar mode to Java. When scrollbar
2010-04-14 16:26:55 -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
Eric Laurent
4024e20f13 am 758dd527: Fix issue 2592680: Saved ringer volume forced to 0 when receiving a call in silent mode.
Merge commit '758dd527f64f1e827adfe09f0141ab213733ca22' into froyo-plus-aosp

* commit '758dd527f64f1e827adfe09f0141ab213733ca22':
  Fix issue 2592680: Saved ringer volume forced to 0 when receiving a call in silent mode.
2010-04-14 12:09:52 -07:00
Eric Laurent
0536e3255c am 745b43c2: Merge "Fix issue 2589563: Able to set ringer volume to 0 outside of silent mode." into froyo
Merge commit '745b43c28fd6bb82c72a15b28be75c55dd115171' into froyo-plus-aosp

* commit '745b43c28fd6bb82c72a15b28be75c55dd115171':
  Fix issue 2589563: Able to set ringer volume to 0 outside of silent mode.
2010-04-14 12:04:16 -07:00
Andrei Popescu
8dd91d14ac am 01e3feaf: Merge "Make sure the onended event is dispatched even when the user dismisses the video before it plays to completion." into froyo
Merge commit '01e3feaf54ce6ef2ad4b9fc30f602bafd99cf412' into froyo-plus-aosp

* commit '01e3feaf54ce6ef2ad4b9fc30f602bafd99cf412':
  Make sure the onended event is dispatched even when
2010-04-14 12:04:13 -07:00
Dianne Hackborn
21989a73b7 am 8656145e: Merge "Fix issue #593153: Broadcast time out when sending..." into froyo
Merge commit '8656145e2abe881caffa4181ee5c2e4e3dba1cee' into froyo-plus-aosp

* commit '8656145e2abe881caffa4181ee5c2e4e3dba1cee':
  Fix issue #593153: Broadcast time out when sending...
2010-04-14 12:04:07 -07:00
James Dong
d198c9d51a am d3d445b1: Merge "Use PV_PLAYER to handle RTSP streaming" into froyo
Merge commit 'd3d445b1dca98728a37b5163e018ba890fd9cc50' into froyo-plus-aosp

* commit 'd3d445b1dca98728a37b5163e018ba890fd9cc50':
  Use PV_PLAYER to handle RTSP streaming
2010-04-14 12:03:53 -07:00
Robert Greenwalt
dfea74ea10 am 22b3644a: Update the datause icons.
Merge commit '22b3644ac2027d055a6b187c979ef492ee6fb082' into froyo-plus-aosp

* commit '22b3644ac2027d055a6b187c979ef492ee6fb082':
  Update the datause icons.
2010-04-14 12:03:33 -07:00
Robert Greenwalt
d241170ec8 am 9cb66e89: Merge "Perist Throttle data across reboots" into froyo
Merge commit '9cb66e89cd0c4bfa8d77591719023b7153fee9b9' into froyo-plus-aosp

* commit '9cb66e89cd0c4bfa8d77591719023b7153fee9b9':
  Perist Throttle data across reboots
2010-04-14 12:03:22 -07:00
Leon Scroggins
0b450acc58 am b2212464: Merge "Ensure the selection does not change in setTextAndKeepSelection." into froyo
Merge commit 'b2212464a3bc4103a9e5e88602d1097c835d7949' into froyo-plus-aosp

* commit 'b2212464a3bc4103a9e5e88602d1097c835d7949':
  Ensure the selection does not change in setTextAndKeepSelection.
2010-04-14 12:02:53 -07:00
Kristian Monsen
199bc05e4f am d503a152: Merge "Fix for 2585858, load invalid urls." into froyo
Merge commit 'd503a1524acfcaa85c658240ff88f54d174cbb9e' into froyo-plus-aosp

* commit 'd503a1524acfcaa85c658240ff88f54d174cbb9e':
  Fix for 2585858, load invalid urls.
2010-04-14 12:02:10 -07:00
Kristian Monsen
bb80da1075 am 53c0c0da: Merge "Fix (again) for bug 2558156, update cache encoding correctly" into froyo
Merge commit '53c0c0daf42ca69163fdc1233b3eaca7e382783f' into froyo-plus-aosp

* commit '53c0c0daf42ca69163fdc1233b3eaca7e382783f':
  Fix (again) for bug 2558156, update cache encoding correctly
2010-04-14 12:02:01 -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
8950fece79 am 8e1f2f88: Merge "Fix issue #2555171: Switching to app immediately after unmounting..." into froyo
Merge commit '8e1f2f8804a1f63c7a03a3eeced9ffdf6e6c3293' into froyo-plus-aosp

* commit '8e1f2f8804a1f63c7a03a3eeced9ffdf6e6c3293':
  Fix issue #2555171: Switching to app immediately after unmounting...
2010-04-13 18:10:35 -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
fa88e250f4 am ce73c1e5: Framework change for #2583442: Navigation dies when night mode changes
Merge commit 'ce73c1e5bfd36154d21ee7b332cfdc6cea48812e' into froyo-plus-aosp

* commit 'ce73c1e5bfd36154d21ee7b332cfdc6cea48812e':
  Framework change for #2583442: Navigation dies when night mode changes
2010-04-13 18:05:47 -07:00
Dianne Hackborn
8c16dfac1a am ae8c2c71: Merge "Fix issue #2420340: if FLAG_SHOW_WHEN_LOCKED, do not show keyguard..." into froyo
Merge commit 'ae8c2c71f7791ed0321e56f31f0c1276da4d8842' into froyo-plus-aosp

* commit 'ae8c2c71f7791ed0321e56f31f0c1276da4d8842':
  Fix issue #2420340: if FLAG_SHOW_WHEN_LOCKED, do not show keyguard...
2010-04-13 17:59:56 -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
de2f3005b1 am ba6339fe: 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
Merge commit 'ba6339fe2ba2d7325a99201e82d951064efa31a2' into froyo-plus-aosp

* commit 'ba6339fe2ba2d7325a99201e82d951064efa31a2':
  If we defer processing the touch events, pass the
2010-04-13 17:24:04 -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
Robert Greenwalt
59d87ea610 am d3bb93f6: Add build config values for data use defaults
Merge commit 'd3bb93f6870581eebbf08b5b7fb0a9c5eaad8b16' into froyo-plus-aosp

* commit 'd3bb93f6870581eebbf08b5b7fb0a9c5eaad8b16':
  Add build config values for data use defaults
2010-04-13 16:07:19 -07:00
James Dong
9ef2dd0d62 am dd684af8: Merge "Snif more 3GPP file types according to http://www.ftyps.com/3gpp.html" into froyo
Merge commit 'dd684af8c8fd5984d4d40b125bfac1ce268622ae' into froyo-plus-aosp

* commit 'dd684af8c8fd5984d4d40b125bfac1ce268622ae':
  Snif more 3GPP file types according to http://www.ftyps.com/3gpp.html
2010-04-13 15:37:50 -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
1b41d11990 am 812b24fd: 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 disabl
Merge commit '812b24fd9d254f37e34f2878f599253a1f3bffe9' into froyo-plus-aosp

* commit '812b24fd9d254f37e34f2878f599253a1f3bffe9':
  Fix crashes related to unmounting when app on sdcard has an active notification
2010-04-13 15:32:59 -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
72397544b4 am 42843c3c: Merge "Fix Throttle Notification intents" into froyo
Merge commit '42843c3ceb8b17e860112f8f2718cda40de15839' into froyo-plus-aosp

* commit '42843c3ceb8b17e860112f8f2718cda40de15839':
  Fix Throttle Notification intents
2010-04-13 15:25:05 -07:00
Robert Greenwalt
2a75ab0da5 Merge "Fix Throttle Notification intents" into froyo 2010-04-13 15:22:00 -07:00
Christopher Tate
c33ba4f4e8 am 3069a6da: Merge "SDK: last of the backup/restore docs content" into froyo
Merge commit '3069a6dafabd5a6ba2b1378e2c3b48adb9ba8778' into froyo-plus-aosp

* commit '3069a6dafabd5a6ba2b1378e2c3b48adb9ba8778':
  SDK: last of the backup/restore docs content
2010-04-13 14:24:54 -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
5cfe7910a3 am db281311: 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
Merge commit 'db281311a0e957ba989509cf11f2085b4db12074' into froyo-plus-aosp

* commit 'db281311a0e957ba989509cf11f2085b4db12074':
  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".
2010-04-13 12:20:09 -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
263f52f58e am c15f48d7: Merge "Don\'t set encoder component role while we query decoders" into froyo
Merge commit 'c15f48d7d6047f4f7d7809673fc9728b368f9b0b' into froyo-plus-aosp

* commit 'c15f48d7d6047f4f7d7809673fc9728b368f9b0b':
  Don't set encoder component role while we query decoders
2010-04-13 12:15:26 -07:00
Grace Kloba
6e5467d2b4 am 763e62a8: Fix a case introduced by https://android-git.corp.google.com/g/#change,47640
Merge commit '763e62a831f6cf4e113bff868dab4d48560a3693' into froyo-plus-aosp

* commit '763e62a831f6cf4e113bff868dab4d48560a3693':
  Fix a case introduced by https://android-git.corp.google.com/g/#change,47640
2010-04-13 12:14:32 -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
762e0ff7eb am 842d983c: Merge "Fix an upgrade bug in SettingsProvider." into froyo
Merge commit '842d983cc3158a3de77a897d071b5b9c18dd2b55' into froyo-plus-aosp

* commit '842d983cc3158a3de77a897d071b5b9c18dd2b55':
  Fix an upgrade bug in SettingsProvider.
2010-04-13 10:08:10 -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
54fddcb1e6 am c30890e1: Merge "Fix bug 2578813 Delay pausing music and routing audio for car docks" into froyo
Merge commit 'c30890e102cbae24e4c821ba4274f6ac8b18f1db' into froyo-plus-aosp

* commit 'c30890e102cbae24e4c821ba4274f6ac8b18f1db':
  Fix bug 2578813 Delay pausing music and routing audio for car docks
2010-04-13 09:54:47 -07:00