Adam Powell
2ea21a84ef
Merge "Fix a WebView scrolling regression - bug 2633572." into froyo
2010-04-27 12:05:40 -07:00
Fred Quintana
018579c473
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
b2dbae879d
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
6ce78924eb
Merge "Add JavaDoc for SyncResult http://b/2420252 " into froyo
2010-04-27 11:56:16 -07:00
Adam Powell
7bcf5172aa
Fix a WebView scrolling regression - bug 2633572.
...
Update mLastTouchX/Y on every drag. This prevents the creation of
dead zones that the user has to drag back out of at the edges of
a document.
Change-Id: I348d96dfd3907dba7c6ddd86b678329d65063ba9
2010-04-27 11:45:38 -07:00
Fred Quintana
20c640e0f4
Add JavaDoc for SyncResult
...
http://b/2420252
Change-Id: I88be5232d54959f6ec3480c36751a8fb7dc369fd
2010-04-27 11:21:53 -07:00
San Mehat
c65ede9bf1
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
ff121670b7
am 34483a0f: resolved conflicts for merge of 5a8f877c to kraken
2010-04-27 11:20:31 -07:00
Dianne Hackborn
b6c459276f
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
7a61b8400c
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
bd5356468a
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
34483a0f6e
resolved conflicts for merge of 5a8f877c to kraken
...
Change-Id: I3e320cfe9fcafe4f49e1863eaeddac96bc3f72c6
2010-04-27 11:06:43 -07:00
San Mehat
57fff78a70
dumpstate: Add blocked process wait-channel info to bugreport
...
Fix for http://b/2630027
Change-Id: I3606d8bf95c58df2b290dbd13f48538d82f16088
Signed-off-by: San Mehat <san@google.com>
2010-04-27 10:53:35 -07:00
Shimeng (Simon) Wang
7ce7cfc32d
Merge "Add good international characters to the path part of Url pattern."
2010-04-27 08:06:54 -07:00
Shimeng (Simon) Wang
40064d3098
Add good international characters to the path part of Url pattern.
...
Change-Id: I05efb7e52a023fcb92db9db2b41dbab2ccca87c7
2010-04-27 12:12:02 +01:00
Svetoslav Ganov
0b29a58714
2604226 Add test cases for the internal accessibility infrastructure.
...
Change-Id: Iaeb2c11b6c2167632086b50d9c79e6459cc072b8
2010-04-26 21:23:54 -07:00
Dianne Hackborn
44f2c6baa6
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
2e4b98dcd8
Merge "Whoops a little more on issue #2631417 : Expose FLAG_EXTERNAL_STORAGE" into froyo
2010-04-26 18:51:31 -07:00
Dianne Hackborn
94c567e1e3
Whoops a little more on issue #2631417 : Expose FLAG_EXTERNAL_STORAGE
...
There was a gap in the bit numbers.
Change-Id: I0feef7dc4abed5db7412659b5ad078caffe4f2d4
2010-04-26 18:50:11 -07:00
Jean-Michel Trivi
8f36a744bc
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
e008dab6a8
Merge "Update sym_action_call icon to match icon used elsewhere"
2010-04-26 18:03:47 -07:00
Jean-Michel Trivi
cd24dae9ca
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
73f37ed826
am 55fb51aa: resolved conflicts for merge of 86303198 to kraken
2010-04-26 18:01:42 -07:00
Dianne Hackborn
5a8f877cf8
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
Dianne Hackborn
3202d38022
Fix issue #2631417 : Expose FLAG_EXTERNAL_STORAGE
...
Also update 8.xml to match the current API.
Change-Id: I668fe56f6c156c2e8daa458baa7410fdb8ebef52
2010-04-26 17:51:34 -07:00
Marco Nelissen
55fb51aa41
resolved conflicts for merge of 86303198 to kraken
...
Change-Id: Idd921c7108e4c2cd4a861ee1fb8b43e5d56f8f2f
2010-04-26 17:42:07 -07:00
Jean-Michel Trivi
6cf3d09636
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.
Change-Id: Ia4b3d16b5447ffafacc093db3a7fe05574089935
2010-04-26 17:21:40 -07:00
Marco Nelissen
863031983d
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
Marco Nelissen
8138cb49e4
Make Surface.toString() show more useful info to help debug bug 2594388.
...
Change-Id: I005d3388503d8886e11a26fece30b87572934f15
2010-04-26 16:51:17 -07:00
Robert Greenwalt
47664252d9
am 87ac404d: am b3444560: am 27fba679: Fix Throttle reset.
2010-04-26 15:52:56 -07:00
Robert Greenwalt
87ac404d6d
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
b344456083
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
cbb02b9a66
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
62801264e3
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
27fba6797b
Fix Throttle reset.
...
The start and end times were precisely the same so, a ">" check needed to be ">=".
Also removed useless code and removed the potential problem where continuous gradual
advancement of your start and end times would prevent resets.
bug:2629717
Change-Id: Ieced1965a5611a9b555e92bcf924ec350f2a80db
2010-04-26 12:29:14 -07:00
Robert Greenwalt
6dee0a3fac
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
725d4e7469
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
b0d9d0bffd
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
69d98e3fab
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
0ff9212d07
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
19681af44b
Merge "Handle throttling being disabled via policy change" into froyo
2010-04-26 11:13:11 -07:00
James Dong
40eb3f7b1b
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
069f296c51
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
31431b34f8
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
631447c604
Merge "Add test runner log when test case class is not loaded."
2010-04-26 10:30:56 -07:00
James Dong
374aee6888
Switch to use software MP3 decoder
...
Hardware MP3 decoder could lead to hang in the Music application, although the chance is very low.
bug - 2608400
Change-Id: Ia0b5b6521015fc8d3e086117fa914dcc20ace5bd
2010-04-26 10:23:30 -07:00
Grace Kloba
88b299b123
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
9c61788be1
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
28ca72e9b9
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
edce919fb2
am e30b9ce2: Attempt to fix the build.
2010-04-26 10:11:07 -07:00