OSDN Git Service
Mathias Agopian [Tue, 27 Apr 2010 23:11:38 +0000 (16:11 -0700)]
fix a race condition in undoDequeue(), where 'tail' could be computed incorrectly.
in the undoDequeue() case, 'tail' was recalculated from 'available' and 'head'
however there was a race between this and retireAndLock(), which could cause
'tail' to be recalculated wrongly.
the interesting thing though is that retireAndLock() shouldn't have any impact
on the value of 'tail', which is client-side only attribute.
we fix the race by saving the value of 'tail' before dequeue() and restore it
in the case of undoDequeue(), since we know it doesn't depend on retireAndLock().
Change-Id: I4bcc4d16b6bc4dd93717ee739c603040b18295a0
Steve Howard [Wed, 28 Apr 2010 23:07:18 +0000 (16:07 -0700)]
am
3b20c9e8: am
81ac367b: Merge "Fix a minor bug in transitions to left-edge-up landscape." into froyo
Merge commit '
3b20c9e80533401d8c423977ef86460d789d4e1e' into kraken
* commit '
3b20c9e80533401d8c423977ef86460d789d4e1e':
Fix a minor bug in transitions to left-edge-up landscape.
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:54:35 +0000 (15:54 -0700)]
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:42:23 +0000 (15:42 -0700)]
am
91a62f3d: am
a07c4cbe: Merge "bug:
2622719 move \'forcing of cursor execution\' to ContentProvider" into froyo
Merge commit '
91a62f3d4a6b4f92c694d09e991fc6f82701fc47' into kraken
* commit '
91a62f3d4a6b4f92c694d09e991fc6f82701fc47':
bug:
2622719 move 'forcing of cursor execution' to ContentProvider
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:25:05 +0000 (15:25 -0700)]
am
087b25f7: am
6e4895b6: Merge "Make timezone changes apply to status bar time in 24hr mode. Bug:
2632681" into froyo
Merge commit '
087b25f7e2669497cf217d873437e8726c139abd' into kraken
* commit '
087b25f7e2669497cf217d873437e8726c139abd':
Make timezone changes apply to status bar time in 24hr mode. Bug:
2632681
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:18:19 +0000 (14:18 -0700)]
am
00b92b94: 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 '
00b92b943ff397cb7f7c4827a0eea9df7aa22071' into kraken
* commit '
00b92b943ff397cb7f7c4827a0eea9df7aa22071':
revert a change in the SyncManager that caused it to not cancel
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:19:25 +0000 (13:19 -0700)]
am
725f731c: am
bc5a0328: Merge "Fix issue #
2569139: Sapphire user cannot login to last.fm..." into froyo
Merge commit '
725f731cb9368f52a0c6664d2961ef4340c8f7a0' into kraken
* commit '
725f731cb9368f52a0c6664d2961ef4340c8f7a0':
Fix issue #
2569139: Sapphire user cannot login to last.fm...
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
James Dong [Wed, 28 Apr 2010 19:03:55 +0000 (12:03 -0700)]
Merge "Use timestamp from camera driver for CameraSource" into kraken
James Dong [Tue, 27 Apr 2010 00:48:26 +0000 (17:48 -0700)]
Use timestamp from camera driver for CameraSource
Change-Id: I09ddec69997c43b8f17fdd21304c76cb4c5ab8cf
Kenny Root [Wed, 28 Apr 2010 16:47:27 +0000 (09:47 -0700)]
am
9fe55514: am
4bba2149: Merge "Import revised translations" into froyo
Merge commit '
9fe55514524993936eafe9e77e3dd98ba17a78b6' into kraken
* commit '
9fe55514524993936eafe9e77e3dd98ba17a78b6':
Import revised translations
Scott Main [Wed, 28 Apr 2010 16:47:19 +0000 (09:47 -0700)]
am
ca54674c: 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
Merge commit '
ca54674c656b5cf66cfeda42ef7a640971618f2a' into kraken
* commit '
ca54674c656b5cf66cfeda42ef7a640971618f2a':
docs: update information about developing on a device.
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:53:16 +0000 (16:53 -0700)]
am
785c8983: am
996960de: Merge "remove myname accidentally included in one of the files" into froyo
Merge commit '
785c89835741ca735fbb766bc2e1aeb68a4d5169' into kraken
* commit '
785c89835741ca735fbb766bc2e1aeb68a4d5169':
remove myname accidentally included in one of the files
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
Dianne Hackborn [Tue, 27 Apr 2010 23:45:19 +0000 (16:45 -0700)]
am
048b40eb: am
e367896e: Merge "Fix issue #
2594388: WallpaperService doesn\'t always call onSurfaceDestroyed()" into froyo
Merge commit '
048b40ebdc980906193cfcb66274e2a1f3ec6093' into kraken
* commit '
048b40ebdc980906193cfcb66274e2a1f3ec6093':
Fix issue #
2594388: WallpaperService doesn't always call onSurfaceDestroyed()
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:37:41 +0000 (12:37 -0700)]
am
447beb52: am
05fd7e7d: Add good international characters to the path part of Url pattern.
Merge commit '
447beb52be8f97154db2273b4130fd83bf34d840' into kraken
* commit '
447beb52be8f97154db2273b4130fd83bf34d840':
Add good international characters to the path part of Url pattern.
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:11:04 +0000 (12:11 -0700)]
am
b40cfc16: am
2ea21a84: Merge "Fix a WebView scrolling regression - bug
2633572." into froyo
Merge commit '
b40cfc162fc473aece63f449eaa1dd643d24b9c0' into kraken
* commit '
b40cfc162fc473aece63f449eaa1dd643d24b9c0':
Fix a WebView scrolling regression - bug
2633572.
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 19:02:32 +0000 (12:02 -0700)]
am
b2dbae87: am
6ce78924: Merge "Add JavaDoc for SyncResult b/
2420252" into froyo
Merge commit '
b2dbae879d32ce654528ab550c0dd017b67d7b08' into kraken
* commit '
b2dbae879d32ce654528ab550c0dd017b67d7b08':
Add JavaDoc for SyncResult
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:21:17 +0000 (11:21 -0700)]
am
bd535646: am
57fff78a: dumpstate: Add blocked process wait-channel info to bugreport
Merge commit '
bd5356468a5e6823fe4dce040ee75fbef66488dc' into kraken
* commit '
bd5356468a5e6823fe4dce040ee75fbef66488dc':
dumpstate: Add blocked process wait-channel info to bugreport
Dianne Hackborn [Tue, 27 Apr 2010 18:18:24 +0000 (11:18 -0700)]
am
44f2c6ba: am
2e4b98dc: Merge "Whoops a little more on issue #
2631417: Expose FLAG_EXTERNAL_STORAGE" into froyo
Merge commit '
44f2c6baa68e02f7837cd1ca285d5c4f0f871b18' into kraken
* commit '
44f2c6baa68e02f7837cd1ca285d5c4f0f871b18':
Whoops a little more on issue #
2631417: Expose FLAG_EXTERNAL_STORAGE
Jean-Michel Trivi [Tue, 27 Apr 2010 18:17:59 +0000 (11:17 -0700)]
am
8f36a744: 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
Merge commit '
8f36a744bc8933396f237fbda8f21c31ed41d504' into kraken
* commit '
8f36a744bc8933396f237fbda8f21c31ed41d504':
Fix bug
2605504 Don't leak a metric ton of NotificationPlayer threads
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 18:06:43 +0000 (11:06 -0700)]
resolved conflicts for merge of
5a8f877c to kraken
Change-Id: I3e320cfe9fcafe4f49e1863eaeddac96bc3f72c6
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:42:07 +0000 (17:42 -0700)]
resolved conflicts for merge of
86303198 to kraken
Change-Id: Idd921c7108e4c2cd4a861ee1fb8b43e5d56f8f2f
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:47:28 +0000 (15:47 -0700)]
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.
Mathias Agopian [Mon, 26 Apr 2010 22:14:16 +0000 (15:14 -0700)]
Merge "fix [
2615973] ViewRoot locks the Surface even when the dirty region is empty" into kraken
Robert Greenwalt [Mon, 26 Apr 2010 18:22:54 +0000 (11:22 -0700)]
am
0ff9212d: am
19681af4: Merge "Handle throttling being disabled via policy change" into froyo
Merge commit '
0ff9212d077e77f8b3e0afa232293306c0f72d07' into kraken
* commit '
0ff9212d077e77f8b3e0afa232293306c0f72d07':
Handle throttling being disabled via policy change
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:12:37 +0000 (11:12 -0700)]
am
31431b34: 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 '
31431b34f895862ae13efba30bb5771085572687' into kraken
* commit '
31431b34f895862ae13efba30bb5771085572687':
Switch to use software MP3 decoder
Bjorn Bringert [Mon, 26 Apr 2010 18:10:10 +0000 (11:10 -0700)]
am
13cb7a04: am
cb4c894a: Merge "bugfix for: OOM error while doing voice search repeatedly" into froyo
Merge commit '
13cb7a04eaa2479e409216a8ca0826297af85a1d' into kraken
* commit '
13cb7a04eaa2479e409216a8ca0826297af85a1d':
bugfix for: OOM error while doing voice search repeatedly
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:19:39 +0000 (17:19 -0700)]
am
60ae65ed: 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.g
Merge commit '
60ae65ed30564969b3e14642394c5e22c019125d' into kraken
* commit '
60ae65ed30564969b3e14642394c5e22c019125d':
Restrict the range request to the servers claiming
Raphael [Sat, 24 Apr 2010 00:19:35 +0000 (17:19 -0700)]
am
7fca18d4: am
29355534: Fix aapt to build in Windows SDK under Linux
Merge commit '
7fca18d4eadd3da0e616f2663aca41be4a01ec2f' into kraken
* commit '
7fca18d4eadd3da0e616f2663aca41be4a01ec2f':
Fix aapt to build in Windows SDK under Linux
Grace Kloba [Sat, 24 Apr 2010 00:19:31 +0000 (17:19 -0700)]
am
bd17156f: 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 '
bd17156fda946fa0594687337bbd43cd85300940' into kraken
* commit '
bd17156fda946fa0594687337bbd43cd85300940':
Only honor the scrollbar mode at the minimum zoom
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:25:09 +0000 (15:25 -0700)]
am
cdf96f75: am
8b0047f8: Merge "Fix typo when parsing external platform version from Settings." into froyo
Merge commit '
cdf96f75da540d880ae6070d861aeb6adabbe9a3' into kraken
* commit '
cdf96f75da540d880ae6070d861aeb6adabbe9a3':
Fix typo when parsing external platform version from Settings.
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:53:09 +0000 (14:53 -0700)]
am
f6adae78: am
47dad8fa: Merge "Fix bug
2619062 Music is routed to Phone speaker, though it is connected to A2DP media profile" into froyo
Merge commit '
f6adae7866e893afa05b5838bdd244648a66ac3f' into kraken
* commit '
f6adae7866e893afa05b5838bdd244648a66ac3f':
Fix bug
2619062 Music is routed to Phone speaker, though it is
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:28:52 +0000 (14:28 -0700)]
am
994e3990: am
2adec762: Merge "Fix issue #
2621809: Kill! Kill! Kill!" into froyo
Merge commit '
994e39908b167fb70883ce6c1146433e0486e86f' into kraken
* commit '
994e39908b167fb70883ce6c1146433e0486e86f':
Fix issue #
2621809: Kill! Kill! Kill!
Neal Nguyen [Fri, 23 Apr 2010 21:28:48 +0000 (14:28 -0700)]
am
27e5a95a: am
5fa65082: Merge "Re-enabling unit tests for PackageManager/Apps on SD." into froyo
Merge commit '
27e5a95afc10faca6314f9b710f07e8f99b3311f' into kraken
* commit '
27e5a95afc10faca6314f9b710f07e8f99b3311f':
Re-enabling unit tests for PackageManager/Apps on SD.
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:55:05 +0000 (13:55 -0700)]
am
b6c770e4: am
0b2ebe9b: Merge "Respond to changes in throttle policy." into froyo
Merge commit '
b6c770e4e387bd73d4e7d4cbad99079b37f59043' into kraken
* commit '
b6c770e4e387bd73d4e7d4cbad99079b37f59043':
Respond to changes in throttle policy.
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:06:02 +0000 (13:06 -0700)]
am
dc14dc6d: am
bf73bbff: Merge "Some debugging help for issue #
2594388" into froyo
Merge commit '
dc14dc6d60675be688c333bbc60a315d2c658054' into kraken
* commit '
dc14dc6d60675be688c333bbc60a315d2c658054':
Some debugging help for issue #
2594388
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:24:24 +0000 (10:24 -0700)]
am
1b5a9c5d: am
251ccef0: Merge "Add a Throttle check shortly after boot." into froyo
Merge commit '
1b5a9c5d2fdf353d12ef1ca11dafc78f4c6f6c81' into kraken
* commit '
1b5a9c5d2fdf353d12ef1ca11dafc78f4c6f6c81':
Add a Throttle check shortly after boot.
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:41:17 +0000 (16:41 -0700)]
am
9666bbdf: am
7b88af67: Merge "bug #
2618035: applying Moto\'s patch to fix a email/shortcode parsing bug." into froyo
Merge commit '
9666bbdf1bb96dbf42b88443ad042e63971bfb4a' into kraken
* commit '
9666bbdf1bb96dbf42b88443ad042e63971bfb4a':
bug #
2618035: applying Moto's patch to fix a email/shortcode parsing bug.
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:30:01 +0000 (16:30 -0700)]
am
4bcdd6b0: am
90c6aec1: Merge "Fix issue #
2619247: Music sometimes stops playing when navigation talks" into froyo
Merge commit '
4bcdd6b0688735d7da0eb2a4f211b4b4c8911e3b' into kraken
* commit '
4bcdd6b0688735d7da0eb2a4f211b4b4c8911e3b':
Fix issue #
2619247: Music sometimes stops playing when navigation talks
Dianne Hackborn [Thu, 22 Apr 2010 23:29:56 +0000 (16:29 -0700)]
am
476a57e6: am
9bc0a572: Merge "Fix issue #
2608292: Fails to launch the video camera preview" into froyo
Merge commit '
476a57e64a7fa7143e434c1064df1fa87fe4b01a' into kraken
* commit '
476a57e64a7fa7143e434c1064df1fa87fe4b01a':
Fix issue #
2608292: Fails to launch the video camera preview
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