OSDN Git Service
Scott Main [Fri, 30 Apr 2010 04:23:10 +0000 (21:23 -0700)]
am
cd8f7bd4: Merge "docs: editorial revisions to the bmgr tool doc" into froyo
Merge commit '
cd8f7bd4e50db9b5662572988a7dffdb6a4c4187' into froyo-plus-aosp
* commit '
cd8f7bd4e50db9b5662572988a7dffdb6a4c4187':
docs: editorial revisions to the bmgr tool doc
Scott Main [Fri, 30 Apr 2010 04:22:17 +0000 (21:22 -0700)]
Merge "docs: editorial revisions to the bmgr tool doc" into froyo
Marc Blank [Thu, 29 Apr 2010 22:40:30 +0000 (15:40 -0700)]
am
794cd640: Merge "Expose _id in ExtendedProperties subValues" into froyo
Merge commit '
794cd640bfa8c6d82803b59bc18cbd73627a8162' into froyo-plus-aosp
* commit '
794cd640bfa8c6d82803b59bc18cbd73627a8162':
Expose _id in ExtendedProperties subValues
Marc Blank [Thu, 29 Apr 2010 22:39:37 +0000 (15:39 -0700)]
Merge "Expose _id in ExtendedProperties subValues" into froyo
Kenny Root [Thu, 29 Apr 2010 22:29:22 +0000 (15:29 -0700)]
am
77a1beb1: Merge "Import revised translations" into froyo
Merge commit '
77a1beb137948ad45423bb8fcd7e424e36144133' into froyo-plus-aosp
* commit '
77a1beb137948ad45423bb8fcd7e424e36144133':
Import revised translations
Kenny Root [Thu, 29 Apr 2010 22:28:15 +0000 (15:28 -0700)]
Merge "Import revised translations" into froyo
Scott Main [Thu, 29 Apr 2010 22:23:32 +0000 (15:23 -0700)]
am
764caf24: Merge "docs: rewrite information about using shared preferences, internal and external storage (including new apis), and sqlite databases." into froyo
Merge commit '
764caf2481d935ce6870ec141f1e845178df8b47' into froyo-plus-aosp
* commit '
764caf2481d935ce6870ec141f1e845178df8b47':
docs: rewrite information about using shared preferences, internal and
Scott Main [Thu, 29 Apr 2010 22:21:34 +0000 (15:21 -0700)]
Merge "docs: rewrite information about using shared preferences, internal and external storage (including new apis), and sqlite databases." into froyo
Dianne Hackborn [Thu, 29 Apr 2010 19:20:42 +0000 (12:20 -0700)]
am
c956f375: Fix issue #
2641875: Apps on sdcard not accesible after update
Merge commit '
c956f37567593a71271bae107eafec47575f7dcc' into froyo-plus-aosp
* commit '
c956f37567593a71271bae107eafec47575f7dcc':
Fix issue #
2641875: Apps on sdcard not accesible after update
Adam Powell [Thu, 29 Apr 2010 02:34:49 +0000 (19:34 -0700)]
am
b40c42f1: Fix bug
2639949 - Don\'t stop a Scroller early
Merge commit '
b40c42f1ffa124cfbd5152007491c1d0b065592d' into froyo-plus-aosp
* commit '
b40c42f1ffa124cfbd5152007491c1d0b065592d':
Fix bug
2639949 - Don't stop a Scroller early
Steve Howard [Wed, 28 Apr 2010 23:03:28 +0000 (16:03 -0700)]
am
81ac367b: Merge "Fix a minor bug in transitions to left-edge-up landscape." into froyo
Merge commit '
81ac367be66905a5b53b8e7e98160546802bd98b' into froyo-plus-aosp
* commit '
81ac367be66905a5b53b8e7e98160546802bd98b':
Fix a minor bug in transitions to left-edge-up landscape.
Steve Howard [Wed, 28 Apr 2010 22:59:39 +0000 (15:59 -0700)]
Merge "Fix a minor bug in transitions to left-edge-up landscape." into froyo
The Android Open Source Project [Wed, 28 Apr 2010 22:50:56 +0000 (15:50 -0700)]
merge from open-source master
Change-Id: I20fa79289d84a892def9e7f6d6e7026d9de48010
Vasu Nori [Wed, 28 Apr 2010 22:38:44 +0000 (15:38 -0700)]
am
a07c4cbe: Merge "bug:
2622719 move \'forcing of cursor execution\' to ContentProvider" into froyo
Merge commit '
a07c4cbea9756236f0a28c4f0f7e1340bf3e2f06' into froyo-plus-aosp
* commit '
a07c4cbea9756236f0a28c4f0f7e1340bf3e2f06':
bug:
2622719 move 'forcing of cursor execution' to ContentProvider
Vasu Nori [Wed, 28 Apr 2010 22:35:57 +0000 (15:35 -0700)]
Merge "bug:
2622719 move 'forcing of cursor execution' to ContentProvider" into froyo
Amith Yamasani [Wed, 28 Apr 2010 22:21:37 +0000 (15:21 -0700)]
am
6e4895b6: Merge "Make timezone changes apply to status bar time in 24hr mode. Bug:
2632681" into froyo
Merge commit '
6e4895b63aa64a8df64dd69c49a414b7566932d3' into froyo-plus-aosp
* commit '
6e4895b63aa64a8df64dd69c49a414b7566932d3':
Make timezone changes apply to status bar time in 24hr mode. Bug:
2632681
Amith Yamasani [Wed, 28 Apr 2010 22:18:15 +0000 (15:18 -0700)]
Merge "Make timezone changes apply to status bar time in 24hr mode. Bug:
2632681" into froyo
Fred Quintana [Wed, 28 Apr 2010 21:13:55 +0000 (14:13 -0700)]
am
9aaf24f2: Merge "revert a change in the SyncManager that caused it to not cancel long running syncs if the next sync had the same account and authority." into froyo
Merge commit '
9aaf24f2a46eacd1e342f8c0300c3093646e2814' into froyo-plus-aosp
* commit '
9aaf24f2a46eacd1e342f8c0300c3093646e2814':
revert a change in the SyncManager that caused it to not cancel
Fred Quintana [Wed, 28 Apr 2010 21:10:05 +0000 (14:10 -0700)]
Merge "revert a change in the SyncManager that caused it to not cancel long running syncs if the next sync had the same account and authority." into froyo
Dianne Hackborn [Wed, 28 Apr 2010 20:14:43 +0000 (13:14 -0700)]
am
bc5a0328: Merge "Fix issue #
2569139: Sapphire user cannot login to last.fm..." into froyo
Merge commit '
bc5a03286a72dc3627cee313d473178f5a123049' into froyo-plus-aosp
* commit '
bc5a03286a72dc3627cee313d473178f5a123049':
Fix issue #
2569139: Sapphire user cannot login to last.fm...
Dianne Hackborn [Wed, 28 Apr 2010 19:42:00 +0000 (12:42 -0700)]
Merge "Fix issue #
2569139: Sapphire user cannot login to last.fm..." into froyo
Kenny Root [Wed, 28 Apr 2010 16:32:55 +0000 (09:32 -0700)]
am
4bba2149: Merge "Import revised translations" into froyo
Merge commit '
4bba2149f3f2709b24dc40118461c5d683ed6965' into froyo-plus-aosp
* commit '
4bba2149f3f2709b24dc40118461c5d683ed6965':
Import revised translations
Scott Main [Wed, 28 Apr 2010 16:31:28 +0000 (09:31 -0700)]
am
eaa801e2: Merge "docs: update information about developing on a device. Remove details about ADP1 and revise intro. Add links to the device doc from installing guides. Revise the procedures for Running Your Application in both the Eclipse and Other IDE guides to sp
Merge commit '
eaa801e22abb3ea952ecd70ed7d0a876a1e2e3c9' into froyo-plus-aosp
* commit '
eaa801e22abb3ea952ecd70ed7d0a876a1e2e3c9':
docs: update information about developing on a device.
Kenny Root [Wed, 28 Apr 2010 15:05:03 +0000 (08:05 -0700)]
Merge "Import revised translations" into froyo
Scott Main [Wed, 28 Apr 2010 01:35:53 +0000 (18:35 -0700)]
Merge "docs: update information about developing on a device. Remove details about ADP1 and revise intro. Add links to the device doc from installing guides. Revise the procedures for Running Your Application in both the Eclipse and Other IDE guides to specifically describe using a device and make both docs more consistent with each other." into froyo
Vasu Nori [Tue, 27 Apr 2010 23:49:29 +0000 (16:49 -0700)]
am
996960de: Merge "remove myname accidentally included in one of the files" into froyo
Merge commit '
996960dea8ae0c2c5668e1051c5a9c5a4fb4d888' into froyo-plus-aosp
* commit '
996960dea8ae0c2c5668e1051c5a9c5a4fb4d888':
remove myname accidentally included in one of the files
Vasu Nori [Tue, 27 Apr 2010 23:44:58 +0000 (16:44 -0700)]
Merge "remove myname accidentally included in one of the files" into froyo
Dianne Hackborn [Tue, 27 Apr 2010 23:42:42 +0000 (16:42 -0700)]
am
e367896e: Merge "Fix issue #
2594388: WallpaperService doesn\'t always call onSurfaceDestroyed()" into froyo
Merge commit '
e367896e91a0d75250f00f2de3929495595719d4' into froyo-plus-aosp
* commit '
e367896e91a0d75250f00f2de3929495595719d4':
Fix issue #
2594388: WallpaperService doesn't always call onSurfaceDestroyed()
Dianne Hackborn [Tue, 27 Apr 2010 23:39:44 +0000 (16:39 -0700)]
Merge "Fix issue #
2594388: WallpaperService doesn't always call onSurfaceDestroyed()" into froyo
Shimeng (Simon) Wang [Tue, 27 Apr 2010 19:34:03 +0000 (12:34 -0700)]
am
05fd7e7d: Add good international characters to the path part of Url pattern.
Merge commit '
05fd7e7d328261260a348c0b6ba840bc1f60cb14' into froyo-plus-aosp
* commit '
05fd7e7d328261260a348c0b6ba840bc1f60cb14':
Add good international characters to the path part of Url pattern.
Adam Powell [Tue, 27 Apr 2010 19:08:01 +0000 (12:08 -0700)]
am
2ea21a84: Merge "Fix a WebView scrolling regression - bug
2633572." into froyo
Merge commit '
2ea21a84ef81849153f30bbea213acd5be110c08' into froyo-plus-aosp
* commit '
2ea21a84ef81849153f30bbea213acd5be110c08':
Fix a WebView scrolling regression - bug
2633572.
Adam Powell [Tue, 27 Apr 2010 19:05:40 +0000 (12:05 -0700)]
Merge "Fix a WebView scrolling regression - bug
2633572." into froyo
Fred Quintana [Tue, 27 Apr 2010 18:59:12 +0000 (11:59 -0700)]
am
6ce78924: Merge "Add JavaDoc for SyncResult b/
2420252" into froyo
Merge commit '
6ce78924ebd179611c71122b864807dc4525f593' into froyo-plus-aosp
* commit '
6ce78924ebd179611c71122b864807dc4525f593':
Add JavaDoc for SyncResult
Fred Quintana [Tue, 27 Apr 2010 18:56:16 +0000 (11:56 -0700)]
Merge "Add JavaDoc for SyncResult b/
2420252" into froyo
San Mehat [Tue, 27 Apr 2010 18:13:56 +0000 (11:13 -0700)]
am
57fff78a: dumpstate: Add blocked process wait-channel info to bugreport
Merge commit '
57fff78a70c82ca09beb91c4f92d97b6f0b897e4' into froyo-plus-aosp
* commit '
57fff78a70c82ca09beb91c4f92d97b6f0b897e4':
dumpstate: Add blocked process wait-channel info to bugreport
Dianne Hackborn [Tue, 27 Apr 2010 01:54:06 +0000 (18:54 -0700)]
am
2e4b98dc: Merge "Whoops a little more on issue #
2631417: Expose FLAG_EXTERNAL_STORAGE" into froyo
Merge commit '
2e4b98dcd88f14fdb35e46236ec916493c570f28' into froyo-plus-aosp
* commit '
2e4b98dcd88f14fdb35e46236ec916493c570f28':
Whoops a little more on issue #
2631417: Expose FLAG_EXTERNAL_STORAGE
Dianne Hackborn [Tue, 27 Apr 2010 01:51:31 +0000 (18:51 -0700)]
Merge "Whoops a little more on issue #
2631417: Expose FLAG_EXTERNAL_STORAGE" into froyo
Jean-Michel Trivi [Tue, 27 Apr 2010 01:05:28 +0000 (18:05 -0700)]
am
cd24dae9: Merge "Fix bug
2605504 Don\'t leak a metric ton of NotificationPlayer threads The Looper on the thread created in order to be notified of the playback completion of notification sounds, was never stopped, causing the threads to stay around in wait state. T
Merge commit '
cd24dae9ca6550b24333f889935e1de068759ce5' into froyo-plus-aosp
* commit '
cd24dae9ca6550b24333f889935e1de068759ce5':
Fix bug
2605504 Don't leak a metric ton of NotificationPlayer threads
Jean-Michel Trivi [Tue, 27 Apr 2010 01:02:35 +0000 (18:02 -0700)]
Merge "Fix bug
2605504 Don't leak a metric ton of NotificationPlayer threads The Looper on the thread created in order to be notified of the playback completion of notification sounds, was never stopped, causing the threads to stay around in wait state. The fix consists in quitting the Looper used for the previous sound when a new sound is started." into froyo
Dianne Hackborn [Tue, 27 Apr 2010 01:00:08 +0000 (18:00 -0700)]
am
3202d380: Fix issue #
2631417: Expose FLAG_EXTERNAL_STORAGE
Merge commit '
3202d380226043fa665df3c92252f791f8c52d55' into froyo-plus-aosp
* commit '
3202d380226043fa665df3c92252f791f8c52d55':
Fix issue #
2631417: Expose FLAG_EXTERNAL_STORAGE
Marco Nelissen [Tue, 27 Apr 2010 00:19:58 +0000 (17:19 -0700)]
am
8138cb49: Make Surface.toString() show more useful info to help debug bug
2594388.
Merge commit '
8138cb49e47f9a9905a316a217757710185c66aa' into froyo-plus-aosp
* commit '
8138cb49e47f9a9905a316a217757710185c66aa':
Make Surface.toString() show more useful info to help debug bug
2594388.
Robert Greenwalt [Mon, 26 Apr 2010 22:43:27 +0000 (15:43 -0700)]
am
27fba679: Fix Throttle reset.
Merge commit '
27fba6797b07583ef6c280bc287bf327e47f5e66' into froyo-plus-aosp
* commit '
27fba6797b07583ef6c280bc287bf327e47f5e66':
Fix Throttle reset.
Robert Greenwalt [Mon, 26 Apr 2010 18:18:45 +0000 (11:18 -0700)]
am
19681af4: Merge "Handle throttling being disabled via policy change" into froyo
Merge commit '
19681af44b7c7494ae8de28dab8aacc3e9d92390' into froyo-plus-aosp
* commit '
19681af44b7c7494ae8de28dab8aacc3e9d92390':
Handle throttling being disabled via policy change
Robert Greenwalt [Mon, 26 Apr 2010 18:13:11 +0000 (11:13 -0700)]
Merge "Handle throttling being disabled via policy change" into froyo
James Dong [Mon, 26 Apr 2010 18:05:19 +0000 (11:05 -0700)]
am
374aee68: Switch to use software MP3 decoder Hardware MP3 decoder could lead to hang in the Music application, although the chance is very low.
Merge commit '
374aee6888edddc5bcac9a644ad3de812404d3bc' into froyo-plus-aosp
* commit '
374aee6888edddc5bcac9a644ad3de812404d3bc':
Switch to use software MP3 decoder
Bjorn Bringert [Mon, 26 Apr 2010 17:05:57 +0000 (10:05 -0700)]
am
cb4c894a: Merge "bugfix for: OOM error while doing voice search repeatedly" into froyo
Merge commit '
cb4c894afa497943258cfb053ca35436f7b8e29a' into froyo-plus-aosp
* commit '
cb4c894afa497943258cfb053ca35436f7b8e29a':
bugfix for: OOM error while doing voice search repeatedly
Bjorn Bringert [Mon, 26 Apr 2010 14:52:57 +0000 (07:52 -0700)]
Merge "bugfix for: OOM error while doing voice search repeatedly" into froyo
Grace Kloba [Sat, 24 Apr 2010 00:14:49 +0000 (17:14 -0700)]
am
87782f2b: Merge "Restrict the range request to the servers claiming that they accept ranges. This may be too restrict as the spec says the server MAY set this in the response header. But this is the last minute change made in https://android-git.corp.google.com/g/#
Merge commit '
87782f2bdfc679fd8f3c7ae7cd72bfd0e71efdc6' into froyo-plus-aosp
* commit '
87782f2bdfc679fd8f3c7ae7cd72bfd0e71efdc6':
Restrict the range request to the servers claiming
Raphael [Sat, 24 Apr 2010 00:14:21 +0000 (17:14 -0700)]
am
29355534: Fix aapt to build in Windows SDK under Linux
Merge commit '
29355534384ee24bfe9a3bc97d7664dbe478b4fb' into froyo-plus-aosp
* commit '
29355534384ee24bfe9a3bc97d7664dbe478b4fb':
Fix aapt to build in Windows SDK under Linux
Grace Kloba [Sat, 24 Apr 2010 00:14:15 +0000 (17:14 -0700)]
am
85a8dcec: Merge "Only honor the scrollbar mode at the minimum zoom level. This reduced the impact of https://android-git.corp.google.com/g/#change,48683. In GB, we need to revisit this issue." into froyo
Merge commit '
85a8dcec5460edda72e9917d4f02ad1b6a133251' into froyo-plus-aosp
* commit '
85a8dcec5460edda72e9917d4f02ad1b6a133251':
Only honor the scrollbar mode at the minimum zoom
Grace Kloba [Fri, 23 Apr 2010 23:19:22 +0000 (16:19 -0700)]
Merge "Restrict the range request to the servers claiming that they accept ranges. This may be too restrict as the spec says the server MAY set this in the response header. But this is the last minute change made in https://android-git.corp.google.com/g/#change,49444 I think it is safer to be conservative." into froyo
Grace Kloba [Fri, 23 Apr 2010 22:27:58 +0000 (15:27 -0700)]
Merge "Only honor the scrollbar mode at the minimum zoom level. This reduced the impact of https://android-git.corp.google.com/g/#change,48683. In GB, we need to revisit this issue." into froyo
Dianne Hackborn [Fri, 23 Apr 2010 22:22:55 +0000 (15:22 -0700)]
am
8b0047f8: Merge "Fix typo when parsing external platform version from Settings." into froyo
Merge commit '
8b0047f82504ebc9b282ed950a85a758b59c4e14' into froyo-plus-aosp
* commit '
8b0047f82504ebc9b282ed950a85a758b59c4e14':
Fix typo when parsing external platform version from Settings.
Dianne Hackborn [Fri, 23 Apr 2010 22:19:34 +0000 (15:19 -0700)]
Merge "Fix typo when parsing external platform version from Settings." into froyo
Jean-Michel Trivi [Fri, 23 Apr 2010 21:50:55 +0000 (14:50 -0700)]
am
47dad8fa: Merge "Fix bug
2619062 Music is routed to Phone speaker, though it is connected to A2DP media profile" into froyo
Merge commit '
47dad8fa8d1eddf31dd0665a6d341e2f4f593d08' into froyo-plus-aosp
* commit '
47dad8fa8d1eddf31dd0665a6d341e2f4f593d08':
Fix bug
2619062 Music is routed to Phone speaker, though it is
Jean-Michel Trivi [Fri, 23 Apr 2010 21:48:10 +0000 (14:48 -0700)]
Merge "Fix bug
2619062 Music is routed to Phone speaker, though it is connected to A2DP media profile" into froyo
Dianne Hackborn [Fri, 23 Apr 2010 21:25:05 +0000 (14:25 -0700)]
am
2adec762: Merge "Fix issue #
2621809: Kill! Kill! Kill!" into froyo
Merge commit '
2adec762fbb61c73f612acb7463ba765de1296ad' into froyo-plus-aosp
* commit '
2adec762fbb61c73f612acb7463ba765de1296ad':
Fix issue #
2621809: Kill! Kill! Kill!
Neal Nguyen [Fri, 23 Apr 2010 21:25:01 +0000 (14:25 -0700)]
am
5fa65082: Merge "Re-enabling unit tests for PackageManager/Apps on SD." into froyo
Merge commit '
5fa65082f16741394dcfbe756e3880d5c018dace' into froyo-plus-aosp
* commit '
5fa65082f16741394dcfbe756e3880d5c018dace':
Re-enabling unit tests for PackageManager/Apps on SD.
Dianne Hackborn [Fri, 23 Apr 2010 21:23:39 +0000 (14:23 -0700)]
Merge "Fix issue #
2621809: Kill! Kill! Kill!" into froyo
Neal Nguyen [Fri, 23 Apr 2010 21:21:53 +0000 (14:21 -0700)]
Merge "Re-enabling unit tests for PackageManager/Apps on SD." into froyo
Robert Greenwalt [Fri, 23 Apr 2010 20:52:18 +0000 (13:52 -0700)]
am
0b2ebe9b: Merge "Respond to changes in throttle policy." into froyo
Merge commit '
0b2ebe9b45172b9147f86fd69eedb2a200982b68' into froyo-plus-aosp
* commit '
0b2ebe9b45172b9147f86fd69eedb2a200982b68':
Respond to changes in throttle policy.
Robert Greenwalt [Fri, 23 Apr 2010 20:50:03 +0000 (13:50 -0700)]
Merge "Respond to changes in throttle policy." into froyo
Dianne Hackborn [Fri, 23 Apr 2010 20:02:29 +0000 (13:02 -0700)]
am
bf73bbff: Merge "Some debugging help for issue #
2594388" into froyo
Merge commit '
bf73bbffc18f5abb5350fa3a410830c05ad10206' into froyo-plus-aosp
* commit '
bf73bbffc18f5abb5350fa3a410830c05ad10206':
Some debugging help for issue #
2594388
Dianne Hackborn [Fri, 23 Apr 2010 19:59:47 +0000 (12:59 -0700)]
Merge "Some debugging help for issue #
2594388" into froyo
Robert Greenwalt [Fri, 23 Apr 2010 17:20:37 +0000 (10:20 -0700)]
am
251ccef0: Merge "Add a Throttle check shortly after boot." into froyo
Merge commit '
251ccef0445d4456809bfc41a6344e2dae24f2c3' into froyo-plus-aosp
* commit '
251ccef0445d4456809bfc41a6344e2dae24f2c3':
Add a Throttle check shortly after boot.
Robert Greenwalt [Fri, 23 Apr 2010 17:17:14 +0000 (10:17 -0700)]
Merge "Add a Throttle check shortly after boot." into froyo
Wei Huang [Thu, 22 Apr 2010 23:35:56 +0000 (16:35 -0700)]
am
7b88af67: Merge "bug #
2618035: applying Moto\'s patch to fix a email/shortcode parsing bug." into froyo
Merge commit '
7b88af679a9a3b5737343bb996ef392b76d19e73' into froyo-plus-aosp
* commit '
7b88af679a9a3b5737343bb996ef392b76d19e73':
bug #
2618035: applying Moto's patch to fix a email/shortcode parsing bug.
Wei Huang [Thu, 22 Apr 2010 23:33:40 +0000 (16:33 -0700)]
Merge "bug #
2618035: applying Moto's patch to fix a email/shortcode parsing bug." into froyo
Dianne Hackborn [Thu, 22 Apr 2010 23:26:59 +0000 (16:26 -0700)]
am
90c6aec1: Merge "Fix issue #
2619247: Music sometimes stops playing when navigation talks" into froyo
Merge commit '
90c6aec10f969acf9b171b82920480fb6aeb007f' into froyo-plus-aosp
* commit '
90c6aec10f969acf9b171b82920480fb6aeb007f':
Fix issue #
2619247: Music sometimes stops playing when navigation talks
Dianne Hackborn [Thu, 22 Apr 2010 23:24:08 +0000 (16:24 -0700)]
am
9bc0a572: Merge "Fix issue #
2608292: Fails to launch the video camera preview" into froyo
Merge commit '
9bc0a572d8459e0b6209e8a68cb680389c1f8b73' into froyo-plus-aosp
* commit '
9bc0a572d8459e0b6209e8a68cb680389c1f8b73':
Fix issue #
2608292: Fails to launch the video camera preview
Dianne Hackborn [Thu, 22 Apr 2010 23:23:44 +0000 (16:23 -0700)]
Merge "Fix issue #
2619247: Music sometimes stops playing when navigation talks" into froyo
Dianne Hackborn [Thu, 22 Apr 2010 23:20:19 +0000 (16:20 -0700)]
Merge "Fix issue #
2608292: Fails to launch the video camera preview" into froyo
Suchi Amalapurapu [Thu, 22 Apr 2010 22:54:37 +0000 (15:54 -0700)]
am
a2a568e5: Merge "Fix error code when media is filled up." into froyo
Merge commit '
a2a568e58d77848471a2f1d9ab6df2cbb2c916d6' into froyo-plus-aosp
* commit '
a2a568e58d77848471a2f1d9ab6df2cbb2c916d6':
Fix error code when media is filled up.
Suchi Amalapurapu [Thu, 22 Apr 2010 22:52:25 +0000 (15:52 -0700)]
Merge "Fix error code when media is filled up." into froyo
Leon Scroggins [Thu, 22 Apr 2010 21:26:38 +0000 (14:26 -0700)]
am
69ec5c22: Remove the WebTextView if it is drawing when it shouldn\'t.
Merge commit '
69ec5c22d09690d33f0b87a386de13cc61eb9b42' into froyo-plus-aosp
* commit '
69ec5c22d09690d33f0b87a386de13cc61eb9b42':
Remove the WebTextView if it is drawing when it shouldn't.
Grace Kloba [Thu, 22 Apr 2010 20:05:15 +0000 (13:05 -0700)]
am
a6ece18d: Merge "Added the subset of partial content support so that we can continue the interrupted request to support streaming the content even with a brief disconnection." into froyo
Merge commit '
a6ece18d95a35acc4fb3f9648403ce42d0d6b2d7' into froyo-plus-aosp
* commit '
a6ece18d95a35acc4fb3f9648403ce42d0d6b2d7':
Added the subset of partial content support so that
Grace Kloba [Thu, 22 Apr 2010 20:01:55 +0000 (13:01 -0700)]
Merge "Added the subset of partial content support so that we can continue the interrupted request to support streaming the content even with a brief disconnection." into froyo
Christopher Tate [Thu, 22 Apr 2010 19:54:36 +0000 (12:54 -0700)]
am
75a53705: Merge "SDK: new \'bmgr\' docs in the Dev Guide" into froyo
Merge commit '
75a537051de4220d32e8aa72348909757fa11e5d' into froyo-plus-aosp
* commit '
75a537051de4220d32e8aa72348909757fa11e5d':
SDK: new 'bmgr' docs in the Dev Guide
Christopher Tate [Thu, 22 Apr 2010 19:51:22 +0000 (12:51 -0700)]
Merge "SDK: new 'bmgr' docs in the Dev Guide" into froyo
The Android Open Source Project [Thu, 22 Apr 2010 18:43:17 +0000 (11:43 -0700)]
merge from open-source master
Change-Id: I2a3a06f0bd3530f9c0d3cb64ca6a87913649d64b
Robert Greenwalt [Thu, 22 Apr 2010 16:11:35 +0000 (09:11 -0700)]
am
05fa2144: Merge "Trim throttle logs." into froyo
Merge commit '
05fa2144e458dc8f024235ea01b8682055d828bf' into froyo-plus-aosp
* commit '
05fa2144e458dc8f024235ea01b8682055d828bf':
Trim throttle logs.
Robert Greenwalt [Thu, 22 Apr 2010 16:08:25 +0000 (09:08 -0700)]
Merge "Trim throttle logs." into froyo
Grace Kloba [Thu, 22 Apr 2010 15:23:35 +0000 (08:23 -0700)]
am
2fba6d1c: Merge "Post a message to set SurfaceView to be visible when we switch to use the layout size. Otherwise it will first use the old dimension which can exceed the limit, which in turn causes the Browser to crash." into froyo
Merge commit '
2fba6d1c1b445b2d26ccd32eb4084e759f513c5d' into froyo-plus-aosp
* commit '
2fba6d1c1b445b2d26ccd32eb4084e759f513c5d':
Post a message to set SurfaceView to be visible when
Grace Kloba [Thu, 22 Apr 2010 15:20:23 +0000 (08:20 -0700)]
Merge "Post a message to set SurfaceView to be visible when we switch to use the layout size. Otherwise it will first use the old dimension which can exceed the limit, which in turn causes the Browser to crash." into froyo
Kenny Root [Thu, 22 Apr 2010 03:06:51 +0000 (20:06 -0700)]
Merge "Fix broken logic in SettingsProvider.parseProviderList."
Christopher Tate [Thu, 22 Apr 2010 01:15:44 +0000 (18:15 -0700)]
am
36fa4713: Merge "Fix security hole in Google backup transport registration" into froyo
Merge commit '
36fa47139d4621dc4bf8d89caa8650495d901b00' into froyo-plus-aosp
* commit '
36fa47139d4621dc4bf8d89caa8650495d901b00':
Fix security hole in Google backup transport registration
Christopher Tate [Thu, 22 Apr 2010 01:10:20 +0000 (18:10 -0700)]
Merge "Fix security hole in Google backup transport registration" into froyo
John Wang [Wed, 21 Apr 2010 21:46:06 +0000 (14:46 -0700)]
am
23c0b2eb: Merge "Add ILLEGAL_SIM_OR_ME error code." into froyo
Merge commit '
23c0b2eb5a610030ad5afe406987cb09c858ccfb' into froyo-plus-aosp
* commit '
23c0b2eb5a610030ad5afe406987cb09c858ccfb':
Add ILLEGAL_SIM_OR_ME error code.
John Wang [Wed, 21 Apr 2010 21:43:12 +0000 (14:43 -0700)]
Merge "Add ILLEGAL_SIM_OR_ME error code." into froyo
Joe Onorato [Wed, 21 Apr 2010 18:07:43 +0000 (11:07 -0700)]
am
52e70b25: Add title to recent apps dialog.
Merge commit '
52e70b25f8c2f652c27595c8fea0b6cb9f9ed87a' into froyo-plus-aosp
* commit '
52e70b25f8c2f652c27595c8fea0b6cb9f9ed87a':
Add title to recent apps dialog.
The Android Open Source Project [Wed, 21 Apr 2010 16:10:43 +0000 (09:10 -0700)]
merge from open-source master
Change-Id: I08f1feae65b1dfc3f740d78654c267f2e3ae5e85
Mathias Agopian [Wed, 21 Apr 2010 05:26:45 +0000 (22:26 -0700)]
am
83512d4d: DO NOT MERGE fix [
2557396] Adreno200: glDrawTexi() doesn\'t work with height <= 16
Merge commit '
83512d4dfc06137bc2d9db0cb62644c54f41a771' into froyo-plus-aosp
* commit '
83512d4dfc06137bc2d9db0cb62644c54f41a771':
DO NOT MERGE fix [
2557396] Adreno200: glDrawTexi() doesn't work with height <= 16
Mathias Agopian [Wed, 21 Apr 2010 04:55:40 +0000 (21:55 -0700)]
DO NOT MERGE fix [
2557396] Adreno200: glDrawTexi() doesn't work with height <= 16
don't use glDrawTexi() anymore
Change-Id: If71334de39114b0edce7771366f8d8dc26f6911e
Jeff Brown [Wed, 21 Apr 2010 00:54:59 +0000 (17:54 -0700)]
am
22caecda: Merge "Fix PM crash due to bad array bookkeeping logic." into froyo
Merge commit '
22caecda8a24c971972d78a112279c48f242d529' into froyo-plus-aosp
* commit '
22caecda8a24c971972d78a112279c48f242d529':
Fix PM crash due to bad array bookkeeping logic.
Jeff Brown [Wed, 21 Apr 2010 00:53:00 +0000 (17:53 -0700)]
Merge "Fix PM crash due to bad array bookkeeping logic." into froyo
Robert Greenwalt [Wed, 21 Apr 2010 00:39:38 +0000 (17:39 -0700)]
am
be348964: Merge "Move Tethering off the ServerThread." into froyo
Merge commit '
be34896457bb37b4e263efa87316d2e2420adab3' into froyo-plus-aosp
* commit '
be34896457bb37b4e263efa87316d2e2420adab3':
Move Tethering off the ServerThread.
Robert Greenwalt [Wed, 21 Apr 2010 00:37:22 +0000 (17:37 -0700)]
Merge "Move Tethering off the ServerThread." into froyo
Andreas Huber [Tue, 20 Apr 2010 23:32:30 +0000 (16:32 -0700)]
am
9e609b0d: Merge "Apparently select() does not immediately return if one of the masked socket descriptors is closed... Stop relying on select for read-with-timeout functionality and use SO_RCVTIMEO socket option instead." into froyo
Merge commit '
9e609b0dfa155fbe8ba3b5abd4faa188e2270dde' into froyo-plus-aosp
* commit '
9e609b0dfa155fbe8ba3b5abd4faa188e2270dde':
Apparently select() does not immediately return if one of the masked socket descriptors is closed... Stop relying on select for read-with-timeout functionality and use SO_RCVTIMEO socket option instead.
Andreas Huber [Tue, 20 Apr 2010 23:29:23 +0000 (16:29 -0700)]
Merge "Apparently select() does not immediately return if one of the masked socket descriptors is closed... Stop relying on select for read-with-timeout functionality and use SO_RCVTIMEO socket option instead." into froyo
Jean-Michel Trivi [Tue, 20 Apr 2010 23:00:58 +0000 (16:00 -0700)]
am
fe8620ac: Merge "Update AudioService to reflect phone state changes with AudioFocus. Phone calls and rings are treated as a new client, with a dedicated client ID that identifies it in the audio focus stack. When it is present in the stack, others clients cannot re
Merge commit '
fe8620ac42c9b61ab47fab83caa34816e6404ee5' into froyo-plus-aosp
* commit '
fe8620ac42c9b61ab47fab83caa34816e6404ee5':
Update AudioService to reflect phone state changes with AudioFocus.