OSDN Git Service
Alex Gruenstein [Wed, 10 Feb 2010 02:57:11 +0000 (18:57 -0800)]
Merge "Add EXTRA_PARTIAL_RESULTS so that clients can enable receiving results via onPartialResults()"
David Turner [Wed, 10 Feb 2010 02:52:40 +0000 (18:52 -0800)]
Merge "Generate /data/system/packages.list in the PackageManager"
Romain Guy [Wed, 10 Feb 2010 02:50:55 +0000 (18:50 -0800)]
Merge "Fix the lock screen."
Dirk Dougherty [Wed, 10 Feb 2010 02:48:59 +0000 (18:48 -0800)]
am
e524ff53: am
859f4556: Merge "Add generated html docs for SampleSyncAdapter and CubeLiveWallpaper. Add article for live wallpaper." into eclair
Merge commit '
e524ff534e1aabc45819e978c26bf61d9b71f444'
* commit '
e524ff534e1aabc45819e978c26bf61d9b71f444':
Add generated html docs for SampleSyncAdapter and CubeLiveWallpaper. Add article for live wallpaper.
Dirk Dougherty [Wed, 10 Feb 2010 02:44:18 +0000 (18:44 -0800)]
am
859f4556: Merge "Add generated html docs for SampleSyncAdapter and CubeLiveWallpaper. Add article for live wallpaper." into eclair
Merge commit '
859f455645bc49e32330108b1ea9f85ffb80a2cd' into eclair-plus-aosp
* commit '
859f455645bc49e32330108b1ea9f85ffb80a2cd':
Add generated html docs for SampleSyncAdapter and CubeLiveWallpaper. Add article for live wallpaper.
Dirk Dougherty [Wed, 10 Feb 2010 02:41:32 +0000 (18:41 -0800)]
Merge "Add generated html docs for SampleSyncAdapter and CubeLiveWallpaper. Add article for live wallpaper." into eclair
Adam Powell [Wed, 10 Feb 2010 01:35:52 +0000 (17:35 -0800)]
am
87da8606: Manually merged VelocityTracker changes
Merge commit '
87da860616009a86e260e49bbefffe12c1a06607'
* commit '
87da860616009a86e260e49bbefffe12c1a06607':
Use a circular buffer in VelocityTracker
Jason Sams [Wed, 10 Feb 2010 01:08:50 +0000 (17:08 -0800)]
Merge "Preview seperating RenderScript into RenderScript and RenderScriptGL"
Fred Quintana [Wed, 10 Feb 2010 01:07:47 +0000 (17:07 -0800)]
Merge "only make AccountManager throw an exception on blocking calls in the UI thread if the application's SDK is froyo or later"
Shimeng (Simon) Wang [Wed, 10 Feb 2010 00:40:17 +0000 (16:40 -0800)]
Merge "Regenerate the TopLevelDomain from iana.org website."
Eric Fischer [Wed, 10 Feb 2010 00:10:57 +0000 (16:10 -0800)]
Merge "Make the Date Picker fields more consistent in locales with numeric months."
Mathias Agopian [Tue, 9 Feb 2010 23:26:44 +0000 (15:26 -0800)]
Merge "Add support for physically rotated displays"
Shimeng (Simon) Wang [Sat, 6 Feb 2010 01:57:45 +0000 (17:57 -0800)]
Regenerate the TopLevelDomain from iana.org website.
This is to capture recently added top level domains.
modified: common/java/com/android/common/Patterns.java
modified: common/tests/src/com/android/common/PatternsTest.java
Andreas Huber [Tue, 9 Feb 2010 22:28:32 +0000 (14:28 -0800)]
Merge "Defer actual work of setDataSource given a URI to the prepare phase in order to not block the calling thread for any significant amount of time..."
Adam Powell [Tue, 9 Feb 2010 21:19:25 +0000 (13:19 -0800)]
Manually merged VelocityTracker changes
Eugene Koh [Tue, 9 Feb 2010 22:24:08 +0000 (14:24 -0800)]
Merge "Update DroidSansFallback typeface + preserve legacy version"
Andreas Huber [Tue, 9 Feb 2010 22:23:30 +0000 (14:23 -0800)]
Merge "If the codec's input buffer size is too small to accomodate the buffer read from the source, report and error instead of asserting."
Dianne Hackborn [Tue, 9 Feb 2010 22:22:29 +0000 (14:22 -0800)]
Merge "New external storage APIs."
Leon Scroggins [Tue, 9 Feb 2010 22:12:07 +0000 (14:12 -0800)]
Merge "Set the IME action to GO for normal textfields."
Amith Yamasani [Tue, 9 Feb 2010 22:09:58 +0000 (14:09 -0800)]
Merge "Restart input when moving to a new textfield."
Vasu Nori [Tue, 9 Feb 2010 22:07:43 +0000 (14:07 -0800)]
Merge "suppress broken tests(http://b/
2431671)"
Ken Shirriff [Tue, 9 Feb 2010 22:05:48 +0000 (14:05 -0800)]
Merge "Change key dispatch timeout logging."
Dan Egnor [Tue, 9 Feb 2010 21:47:21 +0000 (13:47 -0800)]
Merge "Fix NPE in FileObserver when multiple events pile in for a defunct observer. Also, fix up some bogus whitespace (hard tabs, etc)."
San Mehat [Tue, 9 Feb 2010 21:29:28 +0000 (13:29 -0800)]
Merge "MountService: Check for failure to unmount when enabling UMS and fix reversed logic"
Romain Guy [Tue, 9 Feb 2010 21:21:09 +0000 (13:21 -0800)]
Merge "Properly notifies listener when an animation is cancelled. Bug: #
2428005."
Vasu Nori [Tue, 9 Feb 2010 20:29:21 +0000 (12:29 -0800)]
Merge "change wording in warning msg printed when compiled-sql cache is full"
Andreas Huber [Tue, 9 Feb 2010 20:10:31 +0000 (12:10 -0800)]
Merge "A little less verbosity in stagefright and special treatment for the error state while shutting down."
Bjorn Bringert [Tue, 9 Feb 2010 20:09:28 +0000 (12:09 -0800)]
Merge "Fix NPE in PackageParser"
Eugene Koh [Tue, 9 Feb 2010 20:05:49 +0000 (12:05 -0800)]
Merge "Update the mdpi resource with 2.0 style icons"
Shimeng (Simon) Wang [Tue, 9 Feb 2010 19:39:18 +0000 (11:39 -0800)]
Merge "Take into account the visible title height when scrolling."
Xavier Ducrohet [Tue, 9 Feb 2010 19:29:11 +0000 (11:29 -0800)]
Merge "Add --auto-add-overlay option to aapt."
San Mehat [Tue, 9 Feb 2010 19:02:44 +0000 (11:02 -0800)]
Merge "MountService: Harden for pre-boot usage users"
San Mehat [Tue, 9 Feb 2010 19:02:32 +0000 (11:02 -0800)]
Merge "MountService: Add WARN checks to ASEC calls to catch bad users"
Adam Powell [Tue, 9 Feb 2010 19:01:24 +0000 (11:01 -0800)]
am
18f75bd4: am
e88192b9: Cleanup fixes for ScaleGestureDetector
Merge commit '
18f75bd45cdbfaf175364552f2d0d0dc3b2835c0'
* commit '
18f75bd45cdbfaf175364552f2d0d0dc3b2835c0':
Cleanup fixes for ScaleGestureDetector
Adam Powell [Tue, 9 Feb 2010 18:55:57 +0000 (10:55 -0800)]
am
e88192b9: Cleanup fixes for ScaleGestureDetector
Merge commit '
e88192b9d2a8c364d8545471907c5baa275bb5f6' into eclair-plus-aosp
* commit '
e88192b9d2a8c364d8545471907c5baa275bb5f6':
Cleanup fixes for ScaleGestureDetector
Andreas Huber [Tue, 9 Feb 2010 18:04:57 +0000 (10:04 -0800)]
Merge "During shutdown, don't loop forever on a state transition to OMX_StateInvalid."
San Mehat [Tue, 9 Feb 2010 16:59:13 +0000 (08:59 -0800)]
Merge "NativeDaemonConnector: Improve error reporting and debug formatting"
San Mehat [Tue, 9 Feb 2010 16:58:23 +0000 (08:58 -0800)]
Merge changes I1aabef01,I8dbd0f83
* changes:
SystemServer: Move MountService startup before NotificationManagerService
StorageManager: Check for a null MountService
Leon Scroggins [Tue, 9 Feb 2010 15:53:40 +0000 (07:53 -0800)]
Merge "Handle the Tab key by moving to the next textfield. And ensure there is always a way to get to the next field."
Suchi Amalapurapu [Tue, 9 Feb 2010 07:55:56 +0000 (23:55 -0800)]
resolved conflicts for merge of
37a00a36 to master
Andy Stadler [Tue, 9 Feb 2010 07:06:31 +0000 (23:06 -0800)]
Merge "Fixes to DeviceAdmin & DevicePolicyManager Javadoc"
Suchi Amalapurapu [Tue, 9 Feb 2010 01:27:33 +0000 (17:27 -0800)]
am
08be55b8: Add null checks when scanning a package. Delete packages whose code and resource paths haven\'t been set correctly.
Merge commit '
08be55b8ea917a5273c135a7bdc73e41c8524c05' into eclair-plus-aosp
* commit '
08be55b8ea917a5273c135a7bdc73e41c8524c05':
Add null checks when scanning a package.
Andreas Huber [Tue, 9 Feb 2010 00:39:24 +0000 (16:39 -0800)]
Merge "Properly implement asynchronous preparation of media playback."
Jason Sams [Tue, 9 Feb 2010 00:34:04 +0000 (16:34 -0800)]
Merge "Fix fountain and put the demos back in the optional build."
Chris Tate [Tue, 9 Feb 2010 00:30:35 +0000 (16:30 -0800)]
Merge "Remember which apps have available restore info in the ancestral dataset"
Marco Nelissen [Tue, 9 Feb 2010 00:30:14 +0000 (16:30 -0800)]
Merge "Skip the endianness marker when converting UCS-2 to UTF-8, since it ends up in the UTF-8 string otherwise."
Mathias Agopian [Mon, 8 Feb 2010 23:49:35 +0000 (15:49 -0800)]
Add support for physically rotated displays
This feature is currently controled by a system property.
"ro.sf.hwrotation" can be set to either 90 or 270. It'll cause
SF to rotate the screen by 90 and 270 degres respectively.
That is, if the driver reports 800x480 for instance, and
ro.sf.hwrotation is set to 90, applications will "see" a
480x800 display and will run in portrait.
This is implemented by introducing an extra "display"
transformation in the GraphicPlane.
Gloria Wang [Mon, 8 Feb 2010 23:16:07 +0000 (15:16 -0800)]
Merge "Use Tremor for sim-eng, and Tremolo for other targets."
Marco Nelissen [Mon, 8 Feb 2010 22:59:31 +0000 (14:59 -0800)]
Merge "Add support for the TPOS/TPA (disc number) id3 tag."
Romain Guy [Mon, 8 Feb 2010 22:59:03 +0000 (14:59 -0800)]
Merge "Always remember the last touch mode state when touch mode changes."
Suchi Amalapurapu [Mon, 8 Feb 2010 22:51:38 +0000 (14:51 -0800)]
Merge "Rename media resource broadcasts Add checks for fwdlocked and updated system apps add more tests remove duplicate adds"
Charles Chen [Mon, 8 Feb 2010 22:44:44 +0000 (14:44 -0800)]
Merge "Fixing a race condition in the TextToSpeech service that could be triggered if many long utterances are started and interrupted in rapid succession."
Joe Onorato [Mon, 8 Feb 2010 21:10:46 +0000 (13:10 -0800)]
Merge "Make ComponentName cloneable."
Romain Guy [Mon, 8 Feb 2010 21:06:17 +0000 (13:06 -0800)]
Merge "Prevent crash in KeyboardView when the view is 0x0."
Doug Zongker [Mon, 8 Feb 2010 19:16:59 +0000 (11:16 -0800)]
Merge "add explicit Base64.DEFAULT flag to request default behavior"
Doug Zongker [Mon, 8 Feb 2010 17:06:41 +0000 (09:06 -0800)]
add explicit Base64.DEFAULT flag to request default behavior
Also fix some grammar problems in the javadoc, and prevent the class
from being instantiated.
Change-Id: I4d83184236566a1e77d5f5cce1c4dd3776bcfca3
Vasu Nori [Mon, 8 Feb 2010 18:59:38 +0000 (10:59 -0800)]
Merge "use sqlite 3.6.22 to print and profile the sql statetements"
Gloria Wang [Mon, 8 Feb 2010 18:46:36 +0000 (10:46 -0800)]
Merge "Fix for
2224736. Sometimes mSeeking is reset without calling setSeekTo first."
The Android Open Source Project [Mon, 8 Feb 2010 17:17:10 +0000 (09:17 -0800)]
am
ad9bcb22: merge from open-source master
Merge commit '
ad9bcb22d05fbf130ac64254abd51a137e9a3d3f'
* commit '
ad9bcb22d05fbf130ac64254abd51a137e9a3d3f':
Fix x coordinate of the ACTION_UP event in TouchUtils.drag() method
Fixed Android animation framework, for using interpolators that do not start at 0.0f
Fix for GPS engines without separate session and engine status events.
Be tolerant of GPS session and engine on status messages arriving out of order.
GpsLocationProvider: Do not release wakelock until the GPS engine is fully off
Bjorn Bringert [Mon, 8 Feb 2010 14:20:08 +0000 (06:20 -0800)]
Merge "Fixing a bug when installing VoiceSearch cause error"
Vasu Nori [Sat, 6 Feb 2010 05:37:42 +0000 (21:37 -0800)]
Merge "fix a warning message that is confusing people."
Gloria Wang [Sat, 6 Feb 2010 03:06:38 +0000 (19:06 -0800)]
Merge "Revert "Replace Tremor with Tremolo (an ARM optimised version of the Tremor library for doing Ogg Vorbis decompression)""
Chia-chi Yeh [Sat, 6 Feb 2010 02:46:58 +0000 (18:46 -0800)]
Merge "KeyStore: minor improvements."
Mathias Agopian [Sat, 6 Feb 2010 02:37:17 +0000 (18:37 -0800)]
Merge "fix [
2189862] Race condition in eglIntialize and eglDestroy"
Adam Powell [Sat, 6 Feb 2010 02:01:45 +0000 (18:01 -0800)]
Merge "ListView updates. Fixed several overscrolling bugs. Added programmatic scrolling to ListView. Added auto-scrolling to show expanded content for ExpandableListView. Fixed an AbsListView recycler bug where offscreen views would stick around in the view hierarchy."
Charles Chen [Sat, 6 Feb 2010 01:23:44 +0000 (17:23 -0800)]
Merge "Fixing a bug with the TextToSpeech speech queue processing. The queue processor should not be called for the next item until synthesis has actually happened for the current item; before it was being incorrectly called regardless of whether or not the synthesizer had processed the current item."
Mathias Agopian [Sat, 6 Feb 2010 00:17:01 +0000 (16:17 -0800)]
fix [
2189862] Race condition in eglIntialize and eglDestroy
there is now a lock protext a perticular display. it's held during
initialization and destruction.
Romain Guy [Fri, 5 Feb 2010 23:35:10 +0000 (15:35 -0800)]
Merge "Do not let negative margins reduce the size of the LinearLayout."
Gloria Wang [Fri, 5 Feb 2010 23:18:37 +0000 (15:18 -0800)]
Merge "Replace Tremor with Tremolo (an ARM optimised version of the Tremor library for doing Ogg Vorbis decompression)"
The Android Open Source Project [Fri, 5 Feb 2010 22:23:32 +0000 (14:23 -0800)]
am
0af04493: am
31bfdf69: reconcile main tree with open-source eclair
Merge commit '
0af0449301e72a52beeed8f26021e5460004d67a'
* commit '
0af0449301e72a52beeed8f26021e5460004d67a':
android-2.1_r1 snapshot
Use 128p map tiles for high dpi devices.
Throttle nitz updates as the are too numerous on cdma.
don't request a sync when temp providers are created
Increase light sensor delay from one to two seconds.
Revert jparks code from IPCThreadState.
Add a warning when we leave threads in the binder thread pool in the background scheduling group.
PowerManagerService: Ensure that recent changes do not effect the hardware ALS case.
The Android Open Source Project [Fri, 5 Feb 2010 21:55:16 +0000 (13:55 -0800)]
merge from open-source master
Mathias Agopian [Fri, 5 Feb 2010 21:44:01 +0000 (13:44 -0800)]
Merge "Add support for direct EGLImageKHR use with pushbuffer API"
Mathias Agopian [Fri, 5 Feb 2010 21:43:50 +0000 (13:43 -0800)]
Merge "Proper EGLImageKHR error handling"
Adam Powell [Fri, 5 Feb 2010 21:01:22 +0000 (13:01 -0800)]
Merge "Use a circular buffer in VelocityTracker"
Romain Guy [Fri, 5 Feb 2010 21:00:06 +0000 (13:00 -0800)]
Merge "Fix dialogs to occupy more space."
Ken Shirriff [Fri, 5 Feb 2010 20:45:15 +0000 (12:45 -0800)]
Merge "Make ACCOUNT_NAME/ACCOUNT_TYPE consistent."
Chris Tate [Fri, 5 Feb 2010 20:38:51 +0000 (12:38 -0800)]
Merge "Don't hold the backup queue lock across a backup operation"
Mike Lockwood [Fri, 5 Feb 2010 20:38:02 +0000 (12:38 -0800)]
Merge "Keep automatic screen brightness monotonically increasing until screen is turned off."
James Dong [Fri, 5 Feb 2010 20:05:42 +0000 (12:05 -0800)]
Merge "When the extractor is not able to be created successfully, don't crash"
Romain Guy [Fri, 5 Feb 2010 18:33:44 +0000 (10:33 -0800)]
Merge "Fix x coordinate of the ACTION_UP event in TouchUtils.drag() method"
The Android Open Source Project [Fri, 5 Feb 2010 16:48:38 +0000 (08:48 -0800)]
am
31bfdf69: reconcile main tree with open-source eclair
Merge commit '
31bfdf695ef741f64066ef605bd6a7e23df88714' into eclair-plus-aosp
* commit '
31bfdf695ef741f64066ef605bd6a7e23df88714':
android-2.1_r1 snapshot
Use 128p map tiles for high dpi devices.
Throttle nitz updates as the are too numerous on cdma.
don't request a sync when temp providers are created
Increase light sensor delay from one to two seconds.
Revert jparks code from IPCThreadState.
Add a warning when we leave threads in the binder thread pool in the background scheduling group.
PowerManagerService: Ensure that recent changes do not effect the hardware ALS case.
Fix regression.
Fix broken build.
Bluetooth A2DP suspend/resume functionality
EventLog when a database file is deleted due to corruption.
Don't forget to clear "backup in progress" state when finishing a pass
Fix issue #
2148939: Sholes slow to wake up in landscape mode
Fix Cdma re-start of default connection.
Merge change 26821 into eclair
Not all WebView's host have permission to read the history.
Merge change 26908 into eclair
The Android Open Source Project [Fri, 5 Feb 2010 16:09:38 +0000 (08:09 -0800)]
reconcile main tree with open-source eclair
Bjorn Bringert [Fri, 5 Feb 2010 14:25:45 +0000 (06:25 -0800)]
Merge "Adding speech recognition service public API"
Doug Zongker [Fri, 5 Feb 2010 13:44:17 +0000 (05:44 -0800)]
Merge "rename encodeString to encodeToString"
Dan Egnor [Fri, 5 Feb 2010 03:48:52 +0000 (19:48 -0800)]
Merge "Add ability to parse HTTP-format moratorium times (since pretty much every user wants this)."
James Dong [Fri, 5 Feb 2010 01:50:05 +0000 (17:50 -0800)]
Merge "Camcorder profile Java API support - Use Enum for Quality instead of int - Use static values() method from Enum, rather than if-else"
Mathias Agopian [Fri, 5 Feb 2010 01:13:06 +0000 (17:13 -0800)]
Add support for direct EGLImageKHR use with pushbuffer API
We now always first try to use the EGLImageKHR directly before
making a copy with copybit. The copy may be needed when
EGLImage doesn't support the requested format, which is
currently the case with YUV.
Doug Zongker [Fri, 5 Feb 2010 01:07:59 +0000 (17:07 -0800)]
rename encodeString to encodeToString
Change-Id: I777530b80a9e8be8c487e140574621cd9d35dc35
Mathias Agopian [Fri, 5 Feb 2010 01:04:53 +0000 (17:04 -0800)]
Proper EGLImageKHR error handling
Validate EGLImageKHR format and return an error for unsupported ones.
Also make sure to return an error when binding EGL_NO_IMAGE_KHR to a texture
Dianne Hackborn [Fri, 5 Feb 2010 00:53:47 +0000 (16:53 -0800)]
Merge "Rename ApplicationContext to ContextImpl."
Doug Zongker [Fri, 5 Feb 2010 00:51:10 +0000 (16:51 -0800)]
Merge "a new java implementation of base64 for android-common"
Chris Tate [Fri, 5 Feb 2010 00:27:42 +0000 (16:27 -0800)]
Merge "Add single-package restore from an app's most-recent data"
Daniel Sandler [Thu, 4 Feb 2010 23:58:18 +0000 (15:58 -0800)]
Merge "Add support in StatusBarManager for disabling ticker text."
Doug Zongker [Thu, 4 Feb 2010 18:39:14 +0000 (10:39 -0800)]
a new java implementation of base64 for android-common
A new Base64 encoder/decoder class. Some benchmarks comparing the
decoder it to those from android.os.Base64Utils (a decode-only native
implementation not accessible to apps) and
org.apache.commons.codec.binary.Base64, all with the JIT enabled:
1k encoded data
APACHE avg: 811 us min: 244 us max: 13671 us
COMMON avg: 263 us min: 30 us max: 4730 us
NATIVE avg: 102 us min: 61 us max: 5493 us
10k encoded data
APACHE avg: 3624 us min: 2746 us max: 23895 us
COMMON avg: 979 us min: 518 us max: 7751 us
NATIVE avg: 817 us min: 762 us max: 3143 us
100k encoded data
APACHE avg: 33167 us min: 31829 us max: 140411 us
COMMON avg: 6047 us min: 5493 us max: 45227 us
NATIVE avg: 10109 us min: 10009 us max: 12451 us
Change-Id: Ic622e3a967a62d57d30bd25b80cbe4e0dd60e764
Dima Zavin [Thu, 4 Feb 2010 23:40:39 +0000 (15:40 -0800)]
Merge "Move the NDK graphics wrapper (libjnigraphics) to frameworks/base/native"
Mathias Agopian [Thu, 4 Feb 2010 23:26:27 +0000 (15:26 -0800)]
Merge "fix [
2313526] sensor enable race condition"
Michael Chan [Thu, 4 Feb 2010 22:59:31 +0000 (14:59 -0800)]
Merge "Unhiding Rfc822Tokenizer.tokenize(CharSequence text, Collection<Rfc822Token> out)"
Suchi Amalapurapu [Thu, 4 Feb 2010 22:59:00 +0000 (14:59 -0800)]
Merge "Some tests for install and replace package."
Kenny Root [Thu, 4 Feb 2010 22:26:40 +0000 (14:26 -0800)]
Merge "resolved conflicts for merge of
dd24f599 to master"
Kenny Root [Thu, 4 Feb 2010 22:23:39 +0000 (14:23 -0800)]
resolved conflicts for merge of
dd24f599 to master
Change-Id: I57c349c493d69585d4c85e8c0970649708c6bd33