OSDN Git Service
Adam Powell [Mon, 19 Apr 2010 22:38:11 +0000 (15:38 -0700)]
am
93d35f77: Merge "Fix bug
2587373 - awaken scrollbars when a scrolling view becomes visible." into froyo
Merge commit '
93d35f77439f54cc55ff63b6e274dec0ac6c3c47' into froyo-plus-aosp
* commit '
93d35f77439f54cc55ff63b6e274dec0ac6c3c47':
Fix bug
2587373 - awaken scrollbars when a scrolling view becomes visible.
Adam Powell [Mon, 19 Apr 2010 22:33:08 +0000 (15:33 -0700)]
Merge "Fix bug
2587373 - awaken scrollbars when a scrolling view becomes visible." into froyo
Robert Greenwalt [Mon, 19 Apr 2010 20:25:46 +0000 (13:25 -0700)]
am
f06f2eb2: Merge "Misc fixes for throttling." into froyo
Merge commit '
f06f2eb2d646789d723d4a08d0681cae5b40b768' into froyo-plus-aosp
* commit '
f06f2eb2d646789d723d4a08d0681cae5b40b768':
Misc fixes for throttling.
Robert Greenwalt [Mon, 19 Apr 2010 20:21:01 +0000 (13:21 -0700)]
Merge "Misc fixes for throttling." into froyo
Grace Kloba [Mon, 19 Apr 2010 20:17:53 +0000 (13:17 -0700)]
am
2dc78498: Merge "Remove fixed size restriction on the SurfaceView before setting it to the full screen content view." into froyo
Merge commit '
2dc784988aa1660d02b50ed4e7d7679ba14b25b4' into froyo-plus-aosp
* commit '
2dc784988aa1660d02b50ed4e7d7679ba14b25b4':
Remove fixed size restriction on the SurfaceView
Grace Kloba [Mon, 19 Apr 2010 20:14:21 +0000 (13:14 -0700)]
Merge "Remove fixed size restriction on the SurfaceView before setting it to the full screen content view." into froyo
Scott Main [Mon, 19 Apr 2010 19:33:18 +0000 (12:33 -0700)]
am
5ce309d3: Merge "add droiddoc flag to include since-tags for api level 8" into froyo
Merge commit '
5ce309d32e9aa28af4d2a6523ba2a4bc8e6d2f53' into froyo-plus-aosp
* commit '
5ce309d32e9aa28af4d2a6523ba2a4bc8e6d2f53':
add droiddoc flag to include since-tags for api level 8
Scott Main [Mon, 19 Apr 2010 19:28:15 +0000 (12:28 -0700)]
Merge "add droiddoc flag to include since-tags for api level 8" into froyo
Brad Fitzpatrick [Mon, 19 Apr 2010 19:22:07 +0000 (12:22 -0700)]
am
11bea2e2: Merge "Reduce lock contention, removing unnecessary synchronization." into froyo
Merge commit '
11bea2e216800c5612144f76d307da653d565be3' into froyo-plus-aosp
* commit '
11bea2e216800c5612144f76d307da653d565be3':
Reduce lock contention, removing unnecessary synchronization.
Grace Kloba [Mon, 19 Apr 2010 19:18:22 +0000 (12:18 -0700)]
am
99c5179f: Merge "Force redraw in touch_up if there is a move." into froyo
Merge commit '
99c5179fafcccff2bcc05b4c7fb04007bb438f67' into froyo-plus-aosp
* commit '
99c5179fafcccff2bcc05b4c7fb04007bb438f67':
Force redraw in touch_up if there is a move.
Brad Fitzpatrick [Mon, 19 Apr 2010 19:17:48 +0000 (12:17 -0700)]
Merge "Reduce lock contention, removing unnecessary synchronization." into froyo
Grace Kloba [Mon, 19 Apr 2010 19:14:41 +0000 (12:14 -0700)]
Merge "Force redraw in touch_up if there is a move." into froyo
Brad Fitzpatrick [Mon, 19 Apr 2010 18:54:05 +0000 (11:54 -0700)]
am
afbf9f8d: Merge "Ease contention on the mProcessStatsThread mutex in updateCpuStats." into froyo
Merge commit '
afbf9f8d6d66a0c1ba8c44a87b120bcad89ad8b5' into froyo-plus-aosp
* commit '
afbf9f8d6d66a0c1ba8c44a87b120bcad89ad8b5':
Ease contention on the mProcessStatsThread mutex in updateCpuStats.
Brad Fitzpatrick [Mon, 19 Apr 2010 18:50:53 +0000 (11:50 -0700)]
Merge "Ease contention on the mProcessStatsThread mutex in updateCpuStats." into froyo
Irfan Sheriff [Mon, 19 Apr 2010 16:55:44 +0000 (09:55 -0700)]
am
18920136: Merge "Reset notification state on wifi enable" into froyo
Merge commit '
1892013643537f5fc330f5b0a02a0e9cb08b1134' into froyo-plus-aosp
* commit '
1892013643537f5fc330f5b0a02a0e9cb08b1134':
Reset notification state on wifi enable
Irfan Sheriff [Mon, 19 Apr 2010 16:50:37 +0000 (09:50 -0700)]
Merge "Reset notification state on wifi enable" into froyo
Jean-Michel Trivi [Mon, 19 Apr 2010 16:45:41 +0000 (09:45 -0700)]
am
04152f98: Merge "Fix bug
2599698 Music paused by itself The NotificationPlayer sets an OnCompletionListener on the MediaPlayer it\'s using to play the notification. NotificationPlayer relies on the completion event to abandon audio focus. The player was started bef
Merge commit '
04152f98ffbd17f54a6b771636ff7f440f0edc78' into froyo-plus-aosp
* commit '
04152f98ffbd17f54a6b771636ff7f440f0edc78':
Fix bug
2599698 Music paused by itself
Jean-Michel Trivi [Mon, 19 Apr 2010 16:41:19 +0000 (09:41 -0700)]
Merge "Fix bug
2599698 Music paused by itself The NotificationPlayer sets an OnCompletionListener on the MediaPlayer it's using to play the notification. NotificationPlayer relies on the completion event to abandon audio focus. The player was started before the listener was set. The theory about the bug is that the player finished playing before the listener was called. Therefore the audio focus was never abandonned, and the music didn't resume." into froyo
Mike Lockwood [Mon, 19 Apr 2010 15:22:39 +0000 (08:22 -0700)]
am
3110bf6d: Merge "Fix inconsistency in how we handle light sensor when battery is low." into froyo
Merge commit '
3110bf6df1cb6d548e678cdcbb8c7349b2ac0d8a' into froyo-plus-aosp
* commit '
3110bf6df1cb6d548e678cdcbb8c7349b2ac0d8a':
Fix inconsistency in how we handle light sensor when battery is low.
Mike Lockwood [Mon, 19 Apr 2010 15:18:58 +0000 (08:18 -0700)]
Merge "Fix inconsistency in how we handle light sensor when battery is low." into froyo
Robert Greenwalt [Sun, 18 Apr 2010 19:27:03 +0000 (12:27 -0700)]
am
7171ea81: Make ThrottleService more tamper resistant.
Merge commit '
7171ea8179e09270e4d6ab825a2320816eee39c5' into froyo-plus-aosp
* commit '
7171ea8179e09270e4d6ab825a2320816eee39c5':
Make ThrottleService more tamper resistant.
Irfan Sheriff [Sat, 17 Apr 2010 16:31:19 +0000 (09:31 -0700)]
am
975d86df: Merge "Dont check on interface value on API" into froyo
Merge commit '
975d86dfc6407314491a18bc715c8c95a8f8f0b1' into froyo-plus-aosp
* commit '
975d86dfc6407314491a18bc715c8c95a8f8f0b1':
Dont check on interface value on API
Irfan Sheriff [Sat, 17 Apr 2010 16:27:25 +0000 (09:27 -0700)]
Merge "Dont check on interface value on API" into froyo
Grace Kloba [Fri, 16 Apr 2010 23:38:25 +0000 (16:38 -0700)]
am
3c44db3f: Merge "Missed a case to resumeUpdatePicture." into froyo
Merge commit '
3c44db3f67c1f0bf82191ba77ca479c0e7fede34' into froyo-plus-aosp
* commit '
3c44db3f67c1f0bf82191ba77ca479c0e7fede34':
Missed a case to resumeUpdatePicture.
Grace Kloba [Fri, 16 Apr 2010 23:34:43 +0000 (16:34 -0700)]
Merge "Missed a case to resumeUpdatePicture." into froyo
Scott Main [Fri, 16 Apr 2010 23:17:55 +0000 (16:17 -0700)]
Scott Main [Fri, 16 Apr 2010 23:14:33 +0000 (16:14 -0700)]
Merge "cherry-pick from master:
c096a9aead60717fc106ceb259bf954a578d3c54 (plus other revisions to resolve bug
2595831)" into froyo
The Android Open Source Project [Fri, 16 Apr 2010 22:18:28 +0000 (15:18 -0700)]
merge from open-source master
Change-Id: I050a2b6f3d09f079a50491aeabb86b242a59d647
Vasu Nori [Fri, 16 Apr 2010 21:53:32 +0000 (14:53 -0700)]
am
1fc46c62: Merge "accept close() on database objects even if the database is closed" into froyo
Merge commit '
1fc46c623f9af8aaccfd519ece78331d9a95e579' into froyo-plus-aosp
* commit '
1fc46c623f9af8aaccfd519ece78331d9a95e579':
accept close() on database objects even if the database is closed
Vasu Nori [Fri, 16 Apr 2010 21:48:47 +0000 (14:48 -0700)]
Merge "accept close() on database objects even if the database is closed" into froyo
Carl Shapiro [Fri, 16 Apr 2010 20:28:23 +0000 (13:28 -0700)]
am
d5a873fb: Merge "Add command line flags to enable lock profiling." into froyo
Merge commit '
d5a873fbe8df67e86990969b6729db0079bbc278' into froyo-plus-aosp
* commit '
d5a873fbe8df67e86990969b6729db0079bbc278':
Add command line flags to enable lock profiling.
Carl Shapiro [Fri, 16 Apr 2010 20:25:03 +0000 (13:25 -0700)]
Merge "Add command line flags to enable lock profiling." into froyo
The Android Open Source Project [Fri, 16 Apr 2010 19:46:21 +0000 (12:46 -0700)]
merge from open-source master
Change-Id: I93512089253f00b3da1e31f8b5f4d6e72fae8dc4
Mike Reed [Fri, 16 Apr 2010 19:24:09 +0000 (12:24 -0700)]
am
f066611a: retool resize logic to use max dimension and max area.
Merge commit '
f066611aab5758b7b2a6b4a525e3f85aa813064a' into froyo-plus-aosp
* commit '
f066611aab5758b7b2a6b4a525e3f85aa813064a':
retool resize logic to use max dimension and max area.
Mike LeBeau [Fri, 16 Apr 2010 14:27:34 +0000 (07:27 -0700)]
am
0c5ad4f1: Merge "For search suggestions in the search dialog, allow the \'title\' line of text to be up to 2 lines (rather than the usual 1) if no \'description\' line is provided." into froyo
Merge commit '
0c5ad4f1b35ebf3319b68126bd7b4c8a3eb0340a' into froyo-plus-aosp
* commit '
0c5ad4f1b35ebf3319b68126bd7b4c8a3eb0340a':
For search suggestions in the search dialog, allow the 'title'
Mike LeBeau [Fri, 16 Apr 2010 14:23:12 +0000 (07:23 -0700)]
Merge "For search suggestions in the search dialog, allow the 'title' line of text to be up to 2 lines (rather than the usual 1) if no 'description' line is provided." into froyo
Robert Greenwalt [Fri, 16 Apr 2010 00:42:24 +0000 (17:42 -0700)]
am
e80c6f49: Merge "Add multi-sim support to ThrottleService." into froyo
Merge commit '
e80c6f49d5055e299b7ada91b5967feab66e467b' into froyo-plus-aosp
* commit '
e80c6f49d5055e299b7ada91b5967feab66e467b':
Add multi-sim support to ThrottleService.
Robert Greenwalt [Fri, 16 Apr 2010 00:37:55 +0000 (17:37 -0700)]
Merge "Add multi-sim support to ThrottleService." into froyo
Dianne Hackborn [Thu, 15 Apr 2010 20:36:44 +0000 (13:36 -0700)]
am
e3094117: Merge "A little more improvement of the Service javadoc." into froyo
Merge commit '
e3094117a094d8ed2dbd2f4cac15e48b73ceadf4' into froyo-plus-aosp
* commit '
e3094117a094d8ed2dbd2f4cac15e48b73ceadf4':
A little more improvement of the Service javadoc.
Dianne Hackborn [Thu, 15 Apr 2010 20:33:21 +0000 (13:33 -0700)]
Merge "A little more improvement of the Service javadoc." into froyo
Robert Greenwalt [Thu, 15 Apr 2010 20:33:03 +0000 (13:33 -0700)]
am
bf943f29: Merge "Fix SntpClient to give accurate time info." into froyo
Merge commit '
bf943f296864d9647268fb5a55805ebf1fcba173' into froyo-plus-aosp
* commit '
bf943f296864d9647268fb5a55805ebf1fcba173':
Fix SntpClient to give accurate time info.
Robert Greenwalt [Thu, 15 Apr 2010 20:28:43 +0000 (13:28 -0700)]
Merge "Fix SntpClient to give accurate time info." into froyo
David 'Digit' Turner [Thu, 15 Apr 2010 19:19:23 +0000 (12:19 -0700)]
am
4f99e3c2: Remove native binaries when an updated system application is upgraded through OTA.
Merge commit '
4f99e3c28449833b10ee23c538246847fdb6a498' into froyo-plus-aosp
* commit '
4f99e3c28449833b10ee23c538246847fdb6a498':
Remove native binaries when an updated system application is upgraded through OTA.
Kenny Root [Thu, 15 Apr 2010 13:00:18 +0000 (06:00 -0700)]
am
fa22de79: Merge "Import revised translations" into froyo
Merge commit '
fa22de7993f94d338330a888bdc2aeaaf857c719' into froyo-plus-aosp
* commit '
fa22de7993f94d338330a888bdc2aeaaf857c719':
Import revised translations
Kenny Root [Thu, 15 Apr 2010 12:55:00 +0000 (05:55 -0700)]
Merge "Import revised translations" into froyo
Mike Lockwood [Thu, 15 Apr 2010 12:48:26 +0000 (05:48 -0700)]
am
93597ed1: Merge "Fix wakelock leak in PowerManagerService.sendNotificationLocked()" into froyo
Merge commit '
93597ed1839de164c81f83832d4c2373ea32ac8f' into froyo-plus-aosp
* commit '
93597ed1839de164c81f83832d4c2373ea32ac8f':
Fix wakelock leak in PowerManagerService.sendNotificationLocked()
Mike Lockwood [Thu, 15 Apr 2010 12:45:21 +0000 (05:45 -0700)]
Merge "Fix wakelock leak in PowerManagerService.sendNotificationLocked()" into froyo
Dianne Hackborn [Thu, 15 Apr 2010 05:27:10 +0000 (22:27 -0700)]
Robert Greenwalt [Thu, 15 Apr 2010 03:25:51 +0000 (20:25 -0700)]
am
8090edae: Merge "Sholes mobile iface comes/goes - handle the reset" into froyo
Merge commit '
8090edae9ed1228e8cbaa14dd94c6ce885a0b729' into froyo-plus-aosp
* commit '
8090edae9ed1228e8cbaa14dd94c6ce885a0b729':
Sholes mobile iface comes/goes - handle the reset
Suchi Amalapurapu [Thu, 15 Apr 2010 03:25:48 +0000 (20:25 -0700)]
am
deb69370: Revert "Add ordered broadcast when removing packages." Couple of cosmetic fixes as well.
Merge commit '
deb69370ef9a786940ae49411ba657410361b4f1' into froyo-plus-aosp
* commit '
deb69370ef9a786940ae49411ba657410361b4f1':
Revert "Add ordered broadcast when removing packages."
Robert Greenwalt [Thu, 15 Apr 2010 03:23:45 +0000 (20:23 -0700)]
Merge "Sholes mobile iface comes/goes - handle the reset" into froyo
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: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".
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: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: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
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: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
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
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: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 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: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: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
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
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: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: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
OSDN Git Service
