OSDN Git Service
Mathias Agopian [Thu, 15 Apr 2010 21:57:39 +0000 (14:57 -0700)]
when a zero dimension buffer is allocated, turn the allocation into
a 1x1 buffer instead of Nx1 (or 1xN)
Change-Id: I27eeb15e83e13002dd9405f4e52b54f7dffc0fe7
Dianne Hackborn [Thu, 15 Apr 2010 02:09:52 +0000 (19:09 -0700)]
am
68ca59e9: am
b0ef1442: Merge "Fix issue #258640: Automatic propagation of FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET" into froyo
Merge commit '
68ca59e9e69ab4c997987fb0390382a2461386eb' into kraken
* commit '
68ca59e9e69ab4c997987fb0390382a2461386eb':
Fix issue #258640: Automatic propagation of FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET
Dianne Hackborn [Thu, 15 Apr 2010 02:05:11 +0000 (19:05 -0700)]
am
b0ef1442: Merge "Fix issue #258640: Automatic propagation of FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET" into froyo
Merge commit '
b0ef1442866ec52a772e6edfab732a2c987bbee0' into froyo-plus-aosp
* commit '
b0ef1442866ec52a772e6edfab732a2c987bbee0':
Fix issue #258640: Automatic propagation of FLAG_ACTIVITY_CLEAR_WHEN_TASK_RESET
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:40:17 +0000 (18:40 -0700)]
am
13932d85: am
5304d8fd: Merge "Introducing "strict project map"." into froyo
Merge commit '
13932d85066f191db09c4a2fecfa563f0d63d7b7' into kraken
* commit '
13932d85066f191db09c4a2fecfa563f0d63d7b7':
Introducing "strict project map".
Dmitri Plotnikov [Thu, 15 Apr 2010 01:36:36 +0000 (18:36 -0700)]
am
5304d8fd: Merge "Introducing "strict project map"." into froyo
Merge commit '
5304d8fdc9064f2831ef16db9242f17110287997' into froyo-plus-aosp
* commit '
5304d8fdc9064f2831ef16db9242f17110287997':
Introducing "strict project map".
Suchi Amalapurapu [Thu, 15 Apr 2010 01:34:21 +0000 (18:34 -0700)]
am
2ef6e442: am
28b2fdc5: 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 storag
Merge commit '
2ef6e44269ba3c9f6b5d22352461555ebab33b73' into kraken
* commit '
2ef6e44269ba3c9f6b5d22352461555ebab33b73':
Dont fall back to installing on sdcard when internal storage is filled up
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:31:37 +0000 (18:31 -0700)]
am
28b2fdc5: 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 i
Merge commit '
28b2fdc5ee0ad75a476b825e3657b1decd0a2b7c' into froyo-plus-aosp
* commit '
28b2fdc5ee0ad75a476b825e3657b1decd0a2b7c':
Dont fall back to installing on sdcard when internal storage is filled up
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:25:21 +0000 (18:25 -0700)]
am
e7d5a2f9: am
45423465: Merge "fix [
2594950] Flash: Zooming in on some content crashes the Nexus One and causes it to reboot (runtime restart)" into froyo
Merge commit '
e7d5a2f9ae47d8ea8face3f1e451314ed36f4026' into kraken
* commit '
e7d5a2f9ae47d8ea8face3f1e451314ed36f4026':
fix [
2594950] Flash: Zooming in on some content crashes the Nexus One and causes it to reboot (runtime restart)
Mathias Agopian [Thu, 15 Apr 2010 01:22:33 +0000 (18:22 -0700)]
am
45423465: Merge "fix [
2594950] Flash: Zooming in on some content crashes the Nexus One and causes it to reboot (runtime restart)" into froyo
Merge commit '
454234657cd9b0835ecd9c6704cbcd5369e926b1' into froyo-plus-aosp
* commit '
454234657cd9b0835ecd9c6704cbcd5369e926b1':
fix [
2594950] Flash: Zooming in on some content crashes the Nexus One and causes it to reboot (runtime restart)
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:18:29 +0000 (18:18 -0700)]
am
1e21ec92: am
40b6996a: Merge "Add ordered broadcast when removing packages." into froyo
Merge commit '
1e21ec923404a000c46590e4a87ae9ebe87e628e' into kraken
* commit '
1e21ec923404a000c46590e4a87ae9ebe87e628e':
Add ordered broadcast when removing packages.
Suchi Amalapurapu [Thu, 15 Apr 2010 01:15:31 +0000 (18:15 -0700)]
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.
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
Mike Lockwood [Wed, 14 Apr 2010 23:35:29 +0000 (16:35 -0700)]
Merge "GpsLocationProvider: optimize wake lock usage." into kraken
Patrick Scott [Wed, 14 Apr 2010 23:33:44 +0000 (16:33 -0700)]
Merge branch 'kraken' of ssh://android-git:29418/platform/frameworks/base into kraken
Vasu Nori [Wed, 14 Apr 2010 23:33:32 +0000 (16:33 -0700)]
am
bad5f620: am
0bbcdc6c: Merge "verify database state before calling sqlite. Bug:
2593970" into froyo
Merge commit '
bad5f620df13ae41374e05cad0a391ab084664c4' into kraken
* commit '
bad5f620df13ae41374e05cad0a391ab084664c4':
verify database state before calling sqlite. Bug:
2593970
Grace Kloba [Wed, 14 Apr 2010 23:33:27 +0000 (16:33 -0700)]
am
e35a45b7: am
8a878dde: Merge "Pass WebKit scrollbar mode to Java. When scrollbar is alwaysOff, don\'t trigger scroll." into froyo
Merge commit '
e35a45b761ee38c04181bff0a72a6501101bf181' into kraken
* commit '
e35a45b761ee38c04181bff0a72a6501101bf181':
Pass WebKit scrollbar mode to Java. When scrollbar
Vasu Nori [Wed, 14 Apr 2010 23:27:04 +0000 (16:27 -0700)]
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
Grace Kloba [Wed, 14 Apr 2010 23:26:55 +0000 (16:26 -0700)]
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
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 19:15:18 +0000 (12:15 -0700)]
am
def7db5b: am
758dd527: Fix issue
2592680: Saved ringer volume forced to 0 when receiving a call in silent mode.
Merge commit '
def7db5b79e5c178834375020ef6b590e80af42f' into kraken
* commit '
def7db5b79e5c178834375020ef6b590e80af42f':
Fix issue
2592680: Saved ringer volume forced to 0 when receiving a call in silent mode.
Daniel Sandler [Wed, 14 Apr 2010 19:15:04 +0000 (12:15 -0700)]
Merge "Missing resources for lock screen." into kraken
Eric Laurent [Wed, 14 Apr 2010 19:11:24 +0000 (12:11 -0700)]
am
834f0483: am
745b43c2: Merge "Fix issue
2589563: Able to set ringer volume to 0 outside of silent mode." into froyo
Merge commit '
834f0483ee7259f19e3f5d8e5c09ddcf875535b1' into kraken
* commit '
834f0483ee7259f19e3f5d8e5c09ddcf875535b1':
Fix issue
2589563: Able to set ringer volume to 0 outside of silent mode.
Andrei Popescu [Wed, 14 Apr 2010 19:11:21 +0000 (12:11 -0700)]
am
6083f5eb: 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 '
6083f5eb1b1ee5bb026c99cb5018f0d3cc5f5ff3' into kraken
* commit '
6083f5eb1b1ee5bb026c99cb5018f0d3cc5f5ff3':
Make sure the onended event is dispatched even when
Dianne Hackborn [Wed, 14 Apr 2010 19:11:17 +0000 (12:11 -0700)]
am
11d7502b: am
8656145e: Merge "Fix issue #593153: Broadcast time out when sending..." into froyo
Merge commit '
11d7502b35374da12168004e277bcc87f4f7bb50' into kraken
* commit '
11d7502b35374da12168004e277bcc87f4f7bb50':
Fix issue #593153: Broadcast time out when sending...
James Dong [Wed, 14 Apr 2010 19:11:12 +0000 (12:11 -0700)]
am
6852b198: am
d3d445b1: Merge "Use PV_PLAYER to handle RTSP streaming" into froyo
Merge commit '
6852b198fbedd9378ed79ca6528a4d6f33b0b677' into kraken
* commit '
6852b198fbedd9378ed79ca6528a4d6f33b0b677':
Use PV_PLAYER to handle RTSP streaming
Robert Greenwalt [Wed, 14 Apr 2010 19:11:07 +0000 (12:11 -0700)]
am
57e60854: am
22b3644a: Update the datause icons.
Merge commit '
57e60854f3c7a64aad3c4178df210c6f3e98ee8b' into kraken
* commit '
57e60854f3c7a64aad3c4178df210c6f3e98ee8b':
Update the datause icons.
Robert Greenwalt [Wed, 14 Apr 2010 19:11:03 +0000 (12:11 -0700)]
am
b26c8dd4: am
9cb66e89: Merge "Perist Throttle data across reboots" into froyo
Merge commit '
b26c8dd432bf0ea8042e04e63c57913c7bd4e3d4' into kraken
* commit '
b26c8dd432bf0ea8042e04e63c57913c7bd4e3d4':
Perist Throttle data across reboots
Leon Scroggins [Wed, 14 Apr 2010 19:10:58 +0000 (12:10 -0700)]
am
876a5dfe: am
b2212464: Merge "Ensure the selection does not change in setTextAndKeepSelection." into froyo
Merge commit '
876a5dfe3b4a7e0b7bba6b6227a2db2038f29976' into kraken
* commit '
876a5dfe3b4a7e0b7bba6b6227a2db2038f29976':
Ensure the selection does not change in setTextAndKeepSelection.
Kristian Monsen [Wed, 14 Apr 2010 19:10:53 +0000 (12:10 -0700)]
am
a18df134: am
d503a152: Merge "Fix for
2585858, load invalid urls." into froyo
Merge commit '
a18df1341e29ee08c0c406cc9b1e76b7f6921fa7' into kraken
* commit '
a18df1341e29ee08c0c406cc9b1e76b7f6921fa7':
Fix for
2585858, load invalid urls.
Kristian Monsen [Wed, 14 Apr 2010 19:10:47 +0000 (12:10 -0700)]
am
3e360000: am
53c0c0da: Merge "Fix (again) for bug
2558156, update cache encoding correctly" into froyo
Merge commit '
3e360000fcb1cc60d8786d1340f9a468014c6435' into kraken
* commit '
3e360000fcb1cc60d8786d1340f9a468014c6435':
Fix (again) for bug
2558156, update cache encoding correctly
Eric Laurent [Wed, 14 Apr 2010 19:09:52 +0000 (12:09 -0700)]
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.
Eric Laurent [Wed, 14 Apr 2010 19:04:16 +0000 (12:04 -0700)]
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.
Andrei Popescu [Wed, 14 Apr 2010 19:04:13 +0000 (12:04 -0700)]
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
Dianne Hackborn [Wed, 14 Apr 2010 19:04:07 +0000 (12:04 -0700)]
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...
James Dong [Wed, 14 Apr 2010 19:03:53 +0000 (12:03 -0700)]
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
Robert Greenwalt [Wed, 14 Apr 2010 19:03:33 +0000 (12:03 -0700)]
am
22b3644a: Update the datause icons.
Merge commit '
22b3644ac2027d055a6b187c979ef492ee6fb082' into froyo-plus-aosp
* commit '
22b3644ac2027d055a6b187c979ef492ee6fb082':
Update the datause icons.
Robert Greenwalt [Wed, 14 Apr 2010 19:03:22 +0000 (12:03 -0700)]
am
9cb66e89: Merge "Perist Throttle data across reboots" into froyo
Merge commit '
9cb66e89cd0c4bfa8d77591719023b7153fee9b9' into froyo-plus-aosp
* commit '
9cb66e89cd0c4bfa8d77591719023b7153fee9b9':
Perist Throttle data across reboots
Leon Scroggins [Wed, 14 Apr 2010 19:02:53 +0000 (12:02 -0700)]
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.
Kristian Monsen [Wed, 14 Apr 2010 19:02:10 +0000 (12:02 -0700)]
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.
Kristian Monsen [Wed, 14 Apr 2010 19:02:01 +0000 (12:02 -0700)]
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
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
Jean-Baptiste Queru [Wed, 14 Apr 2010 17:29:49 +0000 (10:29 -0700)]
manual merge
Change-Id: I0a81f92831dabc518cfd33b40ea93fd496a1a01c
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
Daniel Sandler [Wed, 14 Apr 2010 03:34:23 +0000 (20:34 -0700)]
Merge "Manually integrating froyo lockscreen fixes:" into kraken
Dianne Hackborn [Wed, 14 Apr 2010 01:21:45 +0000 (18:21 -0700)]
am
7b16f95c: am
8e1f2f88: Merge "Fix issue #
2555171: Switching to app immediately after unmounting..." into froyo
Merge commit '
7b16f95cd293cedd2b9204428088ea3e2f8399e5' into kraken
* commit '
7b16f95cd293cedd2b9204428088ea3e2f8399e5':
Fix issue #
2555171: Switching to app immediately after unmounting...
Dianne Hackborn [Wed, 14 Apr 2010 01:10:35 +0000 (18:10 -0700)]
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...
Dianne Hackborn [Wed, 14 Apr 2010 01:08:17 +0000 (18:08 -0700)]
am
cd616247: am
ce73c1e5: Framework change for #
2583442: Navigation dies when night mode changes
Merge commit '
cd616247db69bdae8ab781be1f1d646ac7abf755' into kraken
* commit '
cd616247db69bdae8ab781be1f1d646ac7abf755':
Framework change for #
2583442: Navigation dies when night mode changes
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 01:05:47 +0000 (18:05 -0700)]
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
Dianne Hackborn [Wed, 14 Apr 2010 01:02:11 +0000 (18:02 -0700)]
am
fbd22f07: am
ae8c2c71: Merge "Fix issue #
2420340: if FLAG_SHOW_WHEN_LOCKED, do not show keyguard..." into froyo
Merge commit '
fbd22f072b48be4b465085fb5354890e2f10fd32' into kraken
* commit '
fbd22f072b48be4b465085fb5354890e2f10fd32':
Fix issue #
2420340: if FLAG_SHOW_WHEN_LOCKED, do not show keyguard...
Dianne Hackborn [Wed, 14 Apr 2010 00:59:56 +0000 (17:59 -0700)]
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...
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:28:17 +0000 (17:28 -0700)]
am
53a37509: 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 originall
Merge commit '
53a37509c3a9301423ee6ec47c71bcea47e46d9c' into kraken
* commit '
53a37509c3a9301423ee6ec47c71bcea47e46d9c':
If we defer processing the touch events, pass the
Grace Kloba [Wed, 14 Apr 2010 00:24:04 +0000 (17:24 -0700)]
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
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
Robert Greenwalt [Tue, 13 Apr 2010 23:23:09 +0000 (16:23 -0700)]
am
84748629: am
a466ffe0: am
d3bb93f6: Add build config values for data use defaults
James Dong [Tue, 13 Apr 2010 23:23:05 +0000 (16:23 -0700)]
am
c33f583b: am
4f3257cf: am
dd684af8: Merge "Snif more 3GPP file types according to ftyps.com/3gpp.html" into froyo
Suchi Amalapurapu [Tue, 13 Apr 2010 23:23:01 +0000 (16:23 -0700)]
am
2ae08f70: am
a55987df: 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 sen
Robert Greenwalt [Tue, 13 Apr 2010 23:22:51 +0000 (16:22 -0700)]
am
7024396f: am
7125a0dc: am
42843c3c: Merge "Fix Throttle Notification intents" into froyo
Christopher Tate [Tue, 13 Apr 2010 23:22:16 +0000 (16:22 -0700)]
am
0162c3c7: am
3643dc8c: am
3069a6da: Merge "SDK: last of the backup/restore docs content" into froyo
Robert Greenwalt [Tue, 13 Apr 2010 23:09:19 +0000 (16:09 -0700)]
am
a466ffe0: am
d3bb93f6: Add build config values for data use defaults
Merge commit '
a466ffe042ca0a7ef14d3942114f3ea916db225e' into kraken
* commit '
a466ffe042ca0a7ef14d3942114f3ea916db225e':
Add build config values for data use defaults
Robert Greenwalt [Tue, 13 Apr 2010 23:07:19 +0000 (16:07 -0700)]
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
Andreas Huber [Tue, 13 Apr 2010 23:05:49 +0000 (16:05 -0700)]
am
d760afc3: am
30e9c2d4: 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
James Dong [Tue, 13 Apr 2010 23:05:42 +0000 (16:05 -0700)]
am
ebaa935e: am
9bb8e65a: am
c15f48d7: Merge "Don\'t set encoder component role while we query decoders" into froyo
Grace Kloba [Tue, 13 Apr 2010 23:05:34 +0000 (16:05 -0700)]
am
346c97c4: am
58af51a1: am
763e62a8: Fix a case introduced by https://android-git.corp.google.com/g/#change,47640
Amith Yamasani [Tue, 13 Apr 2010 23:05:27 +0000 (16:05 -0700)]
am
61f280d5: am
feb976e6: am
842d983c: Merge "Fix an upgrade bug in SettingsProvider." into froyo
Jean-Michel Trivi [Tue, 13 Apr 2010 23:05:21 +0000 (16:05 -0700)]
am
b8430335: am
34b2ecc8: am
c30890e1: Merge "Fix bug
2578813 Delay pausing music and routing audio for car docks" into froyo
Gloria Wang [Tue, 13 Apr 2010 23:05:13 +0000 (16:05 -0700)]
am
465934d1: am
d4c072d3: am
b19da8e1: Fix for
2581725. Keep the last frame after resume(), and delete it in the next suspend() or reuse it if no new frame is available.
Daniel Sandler [Tue, 13 Apr 2010 23:05:07 +0000 (16:05 -0700)]
am
a32efedd: am
de3601e0: am
bcac4960: Honor the "Never vibrate" setting for incoming calls.
James Dong [Tue, 13 Apr 2010 22:42:01 +0000 (15:42 -0700)]
am
4f3257cf: am
dd684af8: Merge "Snif more 3GPP file types according to ftyps.com/3gpp.html" into froyo
Merge commit '
4f3257cf4667aa28908c401634db849fd2e516af' into kraken
* commit '
4f3257cf4667aa28908c401634db849fd2e516af':
Snif more 3GPP file types according to http://www.ftyps.com/3gpp.html
James Dong [Tue, 13 Apr 2010 22:37:50 +0000 (15:37 -0700)]
am
dd684af8: Merge "Snif more 3GPP file types according to 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
Suchi Amalapurapu [Tue, 13 Apr 2010 22:36:10 +0000 (15:36 -0700)]
am
a55987df: 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
Merge commit '
a55987df919240b045de977217bd55723c37dfcb' into kraken
* commit '
a55987df919240b045de977217bd55723c37dfcb':
Fix crashes related to unmounting when app on sdcard has an active notification
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:32:59 +0000 (15:32 -0700)]
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
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:29:19 +0000 (15:29 -0700)]
am
7125a0dc: am
42843c3c: Merge "Fix Throttle Notification intents" into froyo
Merge commit '
7125a0dca844b066a3f6ebdacaea4ade9e651c8d' into kraken
* commit '
7125a0dca844b066a3f6ebdacaea4ade9e651c8d':
Fix Throttle Notification intents
Robert Greenwalt [Tue, 13 Apr 2010 22:25:05 +0000 (15:25 -0700)]
am
42843c3c: Merge "Fix Throttle Notification intents" into froyo
Merge commit '
42843c3ceb8b17e860112f8f2718cda40de15839' into froyo-plus-aosp
* commit '
42843c3ceb8b17e860112f8f2718cda40de15839':
Fix Throttle Notification intents
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:29:28 +0000 (14:29 -0700)]
am
3643dc8c: am
3069a6da: Merge "SDK: last of the backup/restore docs content" into froyo
Merge commit '
3643dc8c73bbf53c7aa6bb73d09d83c7578639e0' into kraken
* commit '
3643dc8c73bbf53c7aa6bb73d09d83c7578639e0':
SDK: last of the backup/restore docs content
Christopher Tate [Tue, 13 Apr 2010 21:24:54 +0000 (14:24 -0700)]
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
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:23:28 +0000 (12:23 -0700)]
am
30e9c2d4: 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"." in
Merge commit '
30e9c2d4db145e02b5312ce29606b03dd78349d3' into kraken
* commit '
30e9c2d4db145e02b5312ce29606b03dd78349d3':
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".
James Dong [Tue, 13 Apr 2010 19:20:38 +0000 (12:20 -0700)]
am
9bb8e65a: am
c15f48d7: Merge "Don\'t set encoder component role while we query decoders" into froyo
Merge commit '
9bb8e65a7d7dc57fdd7383d64d53414b1aa5cbbc' into kraken
* commit '
9bb8e65a7d7dc57fdd7383d64d53414b1aa5cbbc':
Don't set encoder component role while we query decoders
Grace Kloba [Tue, 13 Apr 2010 19:20:35 +0000 (12:20 -0700)]
am
58af51a1: am
763e62a8: Fix a case introduced by https://android-git.corp.google.com/g/#change,47640
Merge commit '
58af51a1f2afc20ac1f1465b13c300754358be6c' into kraken
* commit '
58af51a1f2afc20ac1f1465b13c300754358be6c':
Fix a case introduced by https://android-git.corp.google.com/g/#change,47640
Andreas Huber [Tue, 13 Apr 2010 19:20:09 +0000 (12:20 -0700)]
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".
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:15:26 +0000 (12:15 -0700)]
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
Grace Kloba [Tue, 13 Apr 2010 19:14:32 +0000 (12:14 -0700)]
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
OSDN Git Service
