Fred Quintana
6de87c4bca
am 018579c4: am b2dbae87: am 6ce78924: Merge "Add JavaDoc for SyncResult http://b/2420252 " into froyo
2010-04-27 18:56:12 -07:00
Brett Chabot
201bb7fdde
Merge "2604226 Add test cases for the internal accessibility infrastructure."
2010-04-27 15:47:12 -07:00
San Mehat
53bbeee6ea
am c65ede9b: am bd535646: am 57fff78a: dumpstate: Add blocked process wait-channel info to bugreport
2010-04-27 12:27:56 -07:00
Dianne Hackborn
d9e72d6be4
am b6c45927: am 44f2c6ba: am 2e4b98dc: Merge "Whoops a little more on issue #2631417 : Expose FLAG_EXTERNAL_STORAGE" into froyo
2010-04-27 12:27:36 -07:00
Jean-Michel Trivi
1ff475f8e2
am 7a61b840: 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 s
2010-04-27 12:27:26 -07:00
Fred Quintana
cefcae7275
am b2dbae87: am 6ce78924: Merge "Add JavaDoc for SyncResult http://b/2420252 " into froyo
...
Merge commit 'b2dbae879d32ce654528ab550c0dd017b67d7b08' into kraken
* commit 'b2dbae879d32ce654528ab550c0dd017b67d7b08':
Add JavaDoc for SyncResult
2010-04-27 12:02:32 -07:00
Fred Quintana
3ce307f151
am 6ce78924: Merge "Add JavaDoc for SyncResult http://b/2420252 " into froyo
...
Merge commit '6ce78924ebd179611c71122b864807dc4525f593' into froyo-plus-aosp
* commit '6ce78924ebd179611c71122b864807dc4525f593':
Add JavaDoc for SyncResult
2010-04-27 11:59:12 -07:00
Fred Quintana
e8bc3ee3a1
Merge "Add JavaDoc for SyncResult http://b/2420252 " into froyo
2010-04-27 11:56:16 -07:00
San Mehat
e050f4ef6d
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
2010-04-27 11:21:17 -07:00
Dianne Hackborn
2a657328a1
am 34483a0f: resolved conflicts for merge of 5a8f877c to kraken
2010-04-27 11:20:31 -07:00
Dianne Hackborn
d369cc7466
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
2010-04-27 11:18:24 -07:00
Jean-Michel Trivi
50b93a33f1
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
2010-04-27 11:17:59 -07:00
San Mehat
85e0ae7216
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
2010-04-27 11:13:56 -07:00
Dianne Hackborn
50352926c2
resolved conflicts for merge of 5a8f877c to kraken
...
Change-Id: I3e320cfe9fcafe4f49e1863eaeddac96bc3f72c6
2010-04-27 11:06:43 -07:00
Shimeng (Simon) Wang
3092b68489
Merge "Add good international characters to the path part of Url pattern."
2010-04-27 08:06:54 -07:00
Dianne Hackborn
23ee1cfec4
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
2010-04-26 18:54:06 -07:00
Dianne Hackborn
818d04abb4
Merge "Whoops a little more on issue #2631417 : Expose FLAG_EXTERNAL_STORAGE" into froyo
2010-04-26 18:51:31 -07:00
Jean-Michel Trivi
739c26b4d4
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
2010-04-26 18:05:28 -07:00
Tim Park
103e2c2dee
Merge "Update sym_action_call icon to match icon used elsewhere"
2010-04-26 18:03:47 -07:00
Jean-Michel Trivi
91e964265e
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
2010-04-26 18:02:35 -07:00
Marco Nelissen
7fd6b0b723
am 55fb51aa: resolved conflicts for merge of 86303198 to kraken
2010-04-26 18:01:42 -07:00
Dianne Hackborn
a30123986d
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
2010-04-26 18:00:08 -07:00
Marco Nelissen
c4e2c6ecdb
resolved conflicts for merge of 86303198 to kraken
...
Change-Id: Idd921c7108e4c2cd4a861ee1fb8b43e5d56f8f2f
2010-04-26 17:42:07 -07:00
Marco Nelissen
91db1ada52
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.
2010-04-26 17:19:58 -07:00
Robert Greenwalt
65599b735b
am 87ac404d: am b3444560: am 27fba679: Fix Throttle reset.
2010-04-26 15:52:56 -07:00
Robert Greenwalt
349397e744
am b3444560: am 27fba679: Fix Throttle reset.
...
Merge commit 'b344456083a4fa3911ebf58c73f022827cc073eb' into kraken
* commit 'b344456083a4fa3911ebf58c73f022827cc073eb':
Fix Throttle reset.
2010-04-26 15:47:28 -07:00
Robert Greenwalt
573828c96f
am 27fba679: Fix Throttle reset.
...
Merge commit '27fba6797b07583ef6c280bc287bf327e47f5e66' into froyo-plus-aosp
* commit '27fba6797b07583ef6c280bc287bf327e47f5e66':
Fix Throttle reset.
2010-04-26 15:43:27 -07:00
Mathias Agopian
760b050d9c
am 62801264: Merge "fix [2615973] ViewRoot locks the Surface even when the dirty region is empty" into kraken
2010-04-26 15:19:26 -07:00
Mathias Agopian
c34c748ffd
Merge "fix [2615973] ViewRoot locks the Surface even when the dirty region is empty" into kraken
2010-04-26 15:14:16 -07:00
Robert Greenwalt
aa862342d3
am 725d4e74: am 0ff9212d: am 19681af4: Merge "Handle throttling being disabled via policy change" into froyo
2010-04-26 11:30:05 -07:00
Robert Greenwalt
4e6a058447
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
2010-04-26 11:22:54 -07:00
James Dong
71aa859eaf
am 40eb3f7b: 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.
2010-04-26 11:20:22 -07:00
Bjorn Bringert
2e2d01dbd0
am 069f296c: am 13cb7a04: am cb4c894a: Merge "bugfix for: OOM error while doing voice search repeatedly" into froyo
2010-04-26 11:20:18 -07:00
Robert Greenwalt
0e44489d1f
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
2010-04-26 11:18:45 -07:00
Robert Greenwalt
5b1336d1a3
Merge "Handle throttling being disabled via policy change" into froyo
2010-04-26 11:13:11 -07:00
James Dong
af39dfa2dc
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
2010-04-26 11:12:37 -07:00
Bjorn Bringert
9e6ea36631
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
2010-04-26 11:10:10 -07:00
James Dong
2f191544a5
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
2010-04-26 11:05:19 -07:00
Brett Chabot
f18cac81f2
Merge "Add test runner log when test case class is not loaded."
2010-04-26 10:30:56 -07:00
Grace Kloba
700303d011
am 93970f55: 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://andro
2010-04-26 10:11:35 -07:00
Raphael
0cf376a62d
am 91720463: am 7fca18d4: am 29355534: Fix aapt to build in Windows SDK under Linux
2010-04-26 10:11:31 -07:00
Grace Kloba
517cd2327a
am 3c8c6919: 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
2010-04-26 10:11:27 -07:00
Jeff Hamilton
75fffea86b
am e30b9ce2: Attempt to fix the build.
2010-04-26 10:11:07 -07:00
Bjorn Bringert
ab11b0e68c
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
2010-04-26 10:05:57 -07:00
Bjorn Bringert
89a7523222
Merge "bugfix for: OOM error while doing voice search repeatedly" into froyo
2010-04-26 07:52:58 -07:00
Grace Kloba
dde6caf374
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
2010-04-23 17:19:39 -07:00
Raphael
a1744ca806
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
2010-04-23 17:19:35 -07:00
Grace Kloba
a3a660c918
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
2010-04-23 17:19:31 -07:00
Grace Kloba
a62848ae0b
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
2010-04-23 17:14:49 -07:00
Raphael
56c1e76d5e
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
2010-04-23 17:14:21 -07:00