Vasu Nori
7537590934
Merge "yet another race condition fix to address bug:2456970"
2010-02-24 14:36:36 -08:00
Grace Kloba
aa13fbedba
Merge "If mPreventDrag is cancelled due to time out, remove the pending TOUCH_EVENTS and then send an ACTION_CANCEL and skip the rest of touch events."
2010-02-24 14:32:50 -08:00
Andreas Huber
62be8e17b0
Merge "Recover from a certain mp3 decoder error instead of signalling an error and thereby stopping decoding."
2010-02-24 14:32:16 -08:00
Grace Kloba
93f5831ef2
If mPreventDrag is cancelled due to time out, remove
...
the pending TOUCH_EVENTS and then send an ACTION_CANCEL
and skip the rest of touch events.
This should address the drag problem Flash plugin has.
Fix http://b/issue?id=245053
2010-02-24 14:31:44 -08:00
Kenny Root
e0e6a9c0fc
Merge "Fix spelling mistakes in attrs_manifest.xml"
2010-02-24 14:14:13 -08:00
Steve Block
f7483b1d5c
Add HTML5 layout tests that currently fail to the DumpRenderTree skipped list
...
All of these tests should pass on Android. This is a temporary measure to track
all of these failures in a central place and to provide a consistent baseline
for DumpRenderTree test results while the problems are fixed.
Change-Id: I2cfaaa8df07be3b43c8e6517f75a7c438f147150
2010-02-24 22:11:07 +00:00
Erik Pasternak
6550c72006
Merge "b/2441327 Added add account intent to public api."
2010-02-24 14:00:01 -08:00
Kenny Root
4217a3e0c2
Fix spelling mistakes in attrs_manifest.xml
...
Change-Id: I6ff54cacff85ff60535b2c03559a33d219c52e72
2010-02-24 13:53:16 -08:00
Kenny Root
846ebf38ab
Merge "Add some backup Javadoc and clean imports"
2010-02-24 13:19:14 -08:00
Andreas Huber
ff0c5c1929
Recover from a certain mp3 decoder error instead of signalling an error and thereby stopping decoding.
2010-02-24 13:19:04 -08:00
Fred Quintana
4855965a14
Merge "- return the accounts when getAccountByTypeAndFeatures is passed a null or empty features set, http://b/issue?id=2467165 - clear the authtokens when the password changes"
2010-02-24 13:15:14 -08:00
Dianne Hackborn
c3b91fd26a
Fix crash in PendingIntentRecord debug output.
...
Add null checks to a few places to avoid crashes when dumping
debug data.
Also add some sanity checks for accessing content providers in
the activity manager.
2010-02-24 13:12:52 -08:00
Kenny Root
5a20ea16d7
Add some backup Javadoc and clean imports
...
Add a bit more Javadoc to the backup infrastructure and clean up unused
imports.
Change-Id: I8ab7c3fb887ae2e8d2f1bfac42f03cb4b42685ef
2010-02-24 12:47:14 -08:00
Vasu Nori
1d7265800d
yet another race condition fix to address bug:2456970
2010-02-24 12:42:46 -08:00
Leon Scroggins
58cf334ff4
Merge "Focus the IME on WebView when no textfield is in focus."
2010-02-24 12:17:35 -08:00
San Mehat
7db3e5e287
AsecTests: Add teardown to tests
...
Signed-off-by: San Mehat <san@google.com >
2010-02-24 12:13:54 -08:00
Fred Quintana
d4a9d6c42b
- return the accounts when getAccountByTypeAndFeatures is
...
passed a null or empty features set, http://b/issue?id=2467165
- clear the authtokens when the password changes
2010-02-24 12:13:01 -08:00
Eric Laurent
ce3e038ac9
Fix issue 2327064: Music played via line out is interrupted due to the phone call audio on BT hs.
...
This is not a real fix for the issue but a change to make sure that the behavior is consistent regardless of
external condidions (WIFI ON or OFF, music started before call or not, A2DP device same as SCO device...).
As there is now way to guaranty good quality audio over both SCO and A2DP simultaneously, especially when WIFI is on, We will stick to this behavior:
When music is playing and we are docked to the desk dock and a call is answered with a BT SCO headset, A2DP output will be suspended.
If music is restarted during the call, it will appear muted to the user until the call is terminated.
2010-02-24 11:54:32 -08:00
Mike Lockwood
963bb682bf
Merge "GpsLocationProvider: Be less aggressive about getting fixes in bad conditions if we have a long fix interval."
2010-02-24 11:52:36 -08:00
Mike Lockwood
b7be5447a0
GpsLocationProvider: Be less aggressive about getting fixes in bad conditions if we have a long fix interval.
...
Change-Id: I68bd884409ca15e584ab70e53cf142d60f318d9c
BUG: 2215714
Signed-off-by: Mike Lockwood <lockwood@android.com >
2010-02-24 14:44:18 -05:00
Eric Fischer
00f58438bd
Filenames of sound effects are not translatable.
2010-02-24 11:43:12 -08:00
Mike Lockwood
5866b97874
Merge "Fix broken location extras in GpsLocationProvider."
2010-02-24 11:39:40 -08:00
Doug Zongker
3963cca7ff
Merge "add "startservice" option to am command-line utility"
2010-02-24 11:38:08 -08:00
Doug Zongker
6fb35fe1ac
add "startservice" option to am command-line utility
...
Allows starting Services in addition to Activities.
Change-Id: Ib078115f6200faa8907b35909af2f64b0c563b38
2010-02-24 11:37:35 -08:00
Nick Pelly
a141ecff2f
Merge "Add documentation to help developers make an RFCOMM conection to a Bluetooth serial board. They all use a well-known UUID that is not really explained anywhere official, and this always trips developers up."
2010-02-24 11:34:03 -08:00
Suchi Amalapurapu
4b69fea63f
Merge "Some framework fixes for apps on sd change hard coded path in installd fix tests Work around for renaming containers. Do forced unmount when destroying containers. Force a gc in default container service to release handle to parsed package and thus avoid getting killed by vold Some cosmetic changes to PackageManager api. Unit tests for renaming container for MountService Remove internal size limit on app to be installed."
2010-02-24 11:33:31 -08:00
Eric Fischer
c9c0f4700a
Merge "Factor bidi algorithm into separate method."
2010-02-24 11:32:51 -08:00
Suchi Amalapurapu
cf6eaeaae9
Some framework fixes for apps on sd
...
change hard coded path in installd
fix tests
Work around for renaming containers.
Do forced unmount when destroying containers.
Force a gc in default container service to release handle to parsed package
and thus avoid getting killed by vold
Some cosmetic changes to PackageManager api.
Unit tests for renaming container for MountService
Remove internal size limit on app to be installed.
2010-02-24 11:31:36 -08:00
Doug Felt
20178d62cf
Factor bidi algorithm into separate method.
...
Add rudimentary support for overriding default base line direction heuristic.
Add some simple tests of the bidi implementation.
2010-02-24 11:21:46 -08:00
The Android Open Source Project
2a399f066d
am 563d3a62: merge from open-source master
...
Merge commit '563d3a62f3762b312a4c0a9d9af15a2333beaede'
* commit '563d3a62f3762b312a4c0a9d9af15a2333beaede':
These changes add access to some status values in widgets listed below:
2010-02-24 11:19:12 -08:00
Nick Pelly
ea5056e5a7
Add documentation to help developers make an RFCOMM conection to a Bluetooth
...
serial board. They all use a well-known UUID that is not really explained
anywhere official, and this always trips developers up.
Change-Id: I53bda44b580f472b1ff1ad196b25485b68f4b5d5
2010-02-24 11:19:10 -08:00
Erik
eebc8e2e8f
b/2441327 Added add account intent to public api.
...
Added ACTION_ADD_ACCOUNT intent and EXTRAS_AUTHORITIES strings to the public
api so that Calendar can send users to the add account screen directly instead
of via the sync settings page.
2010-02-24 11:05:14 -08:00
Xavier Ducrohet
be896a9b2e
Merge "Fix the layoutlib to still support fill_parent."
2010-02-24 10:54:00 -08:00
Mike Lockwood
853226b147
Move LocationTracker test app from vendor/google to frameworks/base/tests
...
Change-Id: I49f1bfe2081f2c48fcb22b74aa2377857c2bae6d
Signed-off-by: Mike Lockwood <lockwood@android.com >
2010-02-24 13:27:58 -05:00
Andy McFadden
b9e5cc3c3a
Merge "Fix build."
2010-02-24 10:15:34 -08:00
Andy McFadden
520f87f595
Fix build.
...
This puts the deprecation status change in the right place.
2010-02-24 10:10:41 -08:00
Romain Guy
3bfd5ed735
Merge "Add disabled state to the Spinner widget. Bug #2464034 "
2010-02-24 10:02:58 -08:00
The Android Open Source Project
563d3a62f3
merge from open-source master
2010-02-24 10:02:55 -08:00
Romain Guy
9897c67c05
Add disabled state to the Spinner widget.
...
Bug #2464034
2010-02-24 10:02:30 -08:00
Mike Lockwood
c8998e1735
Merge "LocationTracker: change copyright from Google to AOSP."
2010-02-24 10:00:51 -08:00
Mike Lockwood
8ab8b411b8
LocationTracker: change copyright from Google to AOSP.
...
Change-Id: Id74bf74ac8eb372617136b4021853270d4bf5174
Signed-off-by: Mike Lockwood <lockwood@android.com >
2010-02-24 12:59:14 -05:00
San Mehat
0ca7305c02
Merge "MountService: Fix bug which would allow apps to try to rename a container whos dst is mounted"
2010-02-24 09:52:55 -08:00
Andy McFadden
834481cf8e
Merge "Add class init stats to alloc counters (API change)."
2010-02-24 09:38:48 -08:00
Andreas Huber
875d259c95
Merge "Tag stagefright development tools as "debug-only"."
2010-02-24 09:12:03 -08:00
The Android Open Source Project
9a352305f8
merge from open-source master
2010-02-24 09:11:10 -08:00
Grace Kloba
681875642a
Merge "Temp disable plugin's signature checking."
2010-02-24 09:09:19 -08:00
Mike Lockwood
63598a0619
Fix broken location extras in GpsLocationProvider.
...
Fixes http://code.google.com/p/android/issues/detail?id=4151
(Satellite count not being provided by Location class any more. Location.getExtras() returns null.)
Change-Id: I4cf2922f4a5ed216541f8a8553523d1f6a1c1d0c
Signed-off-by: Mike Lockwood <lockwood@android.com >
2010-02-24 11:56:33 -05:00
San Mehat
85451ee15f
MountService: Fix bug which would allow apps to try to rename a container whos dst is mounted
...
Signed-off-by: San Mehat <san@google.com >
2010-02-24 08:54:18 -08:00
Kenny Root
9ff1f96fdf
Merge "Use UTF-8 strings to avoid duplicate caching, part 1"
2010-02-24 07:52:27 -08:00
Andy McFadden
c4e1bf7282
Add class init stats to alloc counters (API change).
...
Add calls to retrieve class initialization stats via the allocation
count mechanism.
For bug 2461549.
2010-02-24 07:37:38 -08:00