OSDN Git Service
Leon Clarke [Wed, 3 Feb 2010 15:56:58 +0000 (07:56 -0800)]
Merge "Rebuild a cleaner certificates chain before validating it."
Ben Murdoch [Wed, 3 Feb 2010 10:56:12 +0000 (10:56 +0000)]
Revert "am
3db1ebaf: am
4ed2b1c3: Pass touch event time from Java to WebKit". The corresponding change to external/webkit creates a merge conflict in
Revert the frameworks/base part of the change so we can "do not merge" the external/webkit change and get the build working again. We can then later resolve
the conflict in external/webkit in master directly.
This reverts commit
9ecd9437ed57bedfa2a7626430be03f4924f6b42, reversing
changes made to
019fe73ddbf52edd1819e1d85a0b242ebccc7fc3.
Change-Id: Id1404fb056b033ebd60529dd326ec9a3c32f94b0
Grace Kloba [Wed, 3 Feb 2010 07:23:40 +0000 (23:23 -0800)]
am
3db1ebaf: am
4ed2b1c3: Pass touch event time from Java to WebKit
Merge commit '
3db1ebaf1cc2a097845f217626e31d69e156b73d'
* commit '
3db1ebaf1cc2a097845f217626e31d69e156b73d':
Pass touch event time from Java to WebKit
Jack Palevich [Wed, 3 Feb 2010 06:50:39 +0000 (22:50 -0800)]
Fix ETC1 texture decoding.
etc1_decode_image requires the stride argument to be in bytes, but the
surface->stride field is in pixels. Convert by multiplying by pixel size.
Grace Kloba [Wed, 3 Feb 2010 05:07:05 +0000 (21:07 -0800)]
am
4ed2b1c3: Pass touch event time from Java to WebKit
Merge commit '
4ed2b1c34b2dd0e2bd2f403a6f3de0bdbf473b98' into eclair-mr2-plus-aosp
* commit '
4ed2b1c34b2dd0e2bd2f403a6f3de0bdbf473b98':
Pass touch event time from Java to WebKit
Mathias Agopian [Wed, 3 Feb 2010 04:34:15 +0000 (20:34 -0800)]
Merge "implement [
2396050] Add ETC1 texture support to AGL"
Mathias Agopian [Tue, 2 Feb 2010 02:24:52 +0000 (18:24 -0800)]
implement [
2396050] Add ETC1 texture support to AGL
Ray Chen [Wed, 3 Feb 2010 03:34:29 +0000 (11:34 +0800)]
Add GPS_TIMESTAMP and GPS_DATESTAMP tag to ExifInterface.
Grace Kloba [Wed, 3 Feb 2010 03:08:41 +0000 (19:08 -0800)]
Pass touch event time from Java to WebKit
Ray Chen [Fri, 15 Jan 2010 21:52:41 +0000 (13:52 -0800)]
Add GpsDateTime support to ExifInterface and correct images table's date_taken value to UTC timestamp.
http://b/
2376777
Xavier Ducrohet [Wed, 3 Feb 2010 02:25:38 +0000 (18:25 -0800)]
Merge "Fix the SDK build."
Adam Powell [Mon, 1 Feb 2010 23:03:17 +0000 (15:03 -0800)]
Updated GestureDetector to ignore multitouch if requested by the app
or if targetSdkVersion >= Froyo. Made ScaleGestureDetector
public. current.xml API updates for gestures.
Xavier Ducrohet [Wed, 3 Feb 2010 01:31:34 +0000 (17:31 -0800)]
Fix the SDK build.
Proper link format is <package>.className#methodName(). Not
sure why this worked before.
Change-Id: I23f7f73b735dde47aa2fdc5a0198a16e379ad741
Neal Nguyen [Wed, 3 Feb 2010 01:24:49 +0000 (17:24 -0800)]
Merge "Modifying Services Tests XML file so it builds with the right permissions."
Neal Nguyen [Wed, 3 Feb 2010 01:09:00 +0000 (17:09 -0800)]
Modifying Services Tests XML file so it builds with the right permissions.
Mike LeBeau [Wed, 3 Feb 2010 01:08:05 +0000 (17:08 -0800)]
Merge "Improve some of the documentation in RecognizerIntent to reduce confusion."
Mike LeBeau [Tue, 2 Feb 2010 23:28:52 +0000 (15:28 -0800)]
Improve some of the documentation in RecognizerIntent to reduce confusion.
Specifically point out that startActivity() is not supported for
ACTION_RECOGNIZE_SPEECH, and make the documentation on EXTRA_RESULTS more
clear to point out that this is a part of the results, not the request.
Jason Sams [Tue, 2 Feb 2010 23:46:50 +0000 (15:46 -0800)]
Merge "Hide field packer."
Jason Sams [Tue, 2 Feb 2010 23:45:58 +0000 (15:45 -0800)]
Hide field packer.
Ficus Kirkpatrick [Tue, 2 Feb 2010 23:43:53 +0000 (15:43 -0800)]
Merge "Fix mms-common's pathnames to match package spec."
Ficus Kirkpatrick [Tue, 2 Feb 2010 23:22:35 +0000 (15:22 -0800)]
Fix mms-common's pathnames to match package spec.
Change-Id: I4ae65227ea29dff8a79bd1d9373dec46c4b53598
Mike LeBeau [Tue, 2 Feb 2010 23:30:57 +0000 (15:30 -0800)]
Merge "Add "inline" constant to RecognizerResultsIntent."
Jason Sams [Tue, 2 Feb 2010 23:28:03 +0000 (15:28 -0800)]
Merge "Implement holders for Matrix and Vector data."
Chris Tate [Tue, 2 Feb 2010 23:27:55 +0000 (15:27 -0800)]
Merge "Get rid of now-superfluous "backup or restore in progress" tracking"
Mike LeBeau [Tue, 2 Feb 2010 23:27:43 +0000 (15:27 -0800)]
Add "inline" constant to RecognizerResultsIntent.
Jason Sams [Tue, 2 Feb 2010 23:26:40 +0000 (15:26 -0800)]
Implement holders for Matrix and Vector data.
Christopher Tate [Tue, 2 Feb 2010 23:18:58 +0000 (15:18 -0800)]
Get rid of now-superfluous "backup or restore in progress" tracking
Now that backup/restore/etc operations are queued and serialized, we no longer
need to use external state tracking to prevent overlapping operations.
Change-Id: I14f2a5d740cb97ae062aad55a06f49a2be5dd985
Huahui Wu [Fri, 8 Jan 2010 22:46:14 +0000 (17:46 -0500)]
Rebuild a cleaner certificates chain before validating it.
This change cleans the server certificates:
1. Use the end-entity certificate as found in the chain received from the server as the end-entity cert for the newly built chain.
2. Look at the last cert in the newly built chain, specifically it's "issuer" field. If there's a cert in the chain as received with this as the "subject", and this cert hasn't yet been moved into the newly built chain, move it there (as the new last cert). Repeat this step 2 until you can't continue (because there's no matching previously unused cert left).
3. If the last certificate in the new chain has expired (and it's not the end-entity cert), remember this fact, and remove it (so that we can try if we can validating the chain for a different root). If in this case it turns out that we still can't validate the chain, it's probably the cert expiry error that should be displayed.
This CL also cleans the redundant error detection code and reduces the error messages to two types, which are the only two make differences to the user:
a. SSL_IDMISMATCH for name mismatch,
b. SSL_UNTRUSTED for other reasons.
Andreas Huber [Tue, 2 Feb 2010 21:27:08 +0000 (13:27 -0800)]
Workaround for misbehaving HTTP servers that terminate header lines with a single newline instead of the required CRLF sequence.
related-to-bug:
2414022
Andreas Huber [Tue, 2 Feb 2010 22:41:41 +0000 (14:41 -0800)]
Merge "Don't use a HEAD request to determine redirects, instead do a regular GET (since that's always supported), also limit the number of redirects to avoid infinite redirects. Finally, properly handle the end of stream."
Andreas Huber [Tue, 2 Feb 2010 21:44:09 +0000 (13:44 -0800)]
Don't use a HEAD request to determine redirects, instead do a regular GET (since that's always supported), also limit the number of redirects to avoid infinite redirects. Finally, properly handle the end of stream.
related-to-bug:
2403674
San Mehat [Tue, 2 Feb 2010 21:31:16 +0000 (13:31 -0800)]
Merge "StorageManager: API_CHANGE: Move StorageManager into android.storage"
Andreas Huber [Tue, 2 Feb 2010 21:01:07 +0000 (13:01 -0800)]
Merge "Properly report the duration of a recording into .mp4 files."
San Mehat [Tue, 2 Feb 2010 20:54:07 +0000 (12:54 -0800)]
StorageManager: API_CHANGE: Move StorageManager into android.storage
Signed-off-by: San Mehat <san@google.com>
Oscar Montemayor [Tue, 2 Feb 2010 20:15:26 +0000 (12:15 -0800)]
Merge "Apps on SD project. Javadoc fixes for new method in PackageManager class."
Andreas Huber [Tue, 2 Feb 2010 20:13:30 +0000 (12:13 -0800)]
Properly report the duration of a recording into .mp4 files.
related-to-bug:
2295468
Grace Kloba [Tue, 2 Feb 2010 19:59:38 +0000 (11:59 -0800)]
Merge "Now mSupportMultiTouch is depending on WebSettings, it can't be static any more."
Andreas Huber [Tue, 2 Feb 2010 19:38:19 +0000 (11:38 -0800)]
Merge "Properly advertise the content length of the HTTP stream if available."
Grace Kloba [Tue, 2 Feb 2010 19:17:55 +0000 (11:17 -0800)]
Now mSupportMultiTouch is depending on WebSettings,
it can't be static any more.
Fix http://b/issue?id=
2413364
San Mehat [Mon, 1 Feb 2010 18:23:27 +0000 (10:23 -0800)]
Context: API_CHANGE: Add support for retrieving StorageManager
Signed-off-by: San Mehat <san@google.com>
San Mehat [Fri, 29 Jan 2010 13:35:53 +0000 (05:35 -0800)]
DefaultContainerService: Refactor MountService calls (new api)
Signed-off-by: San Mehat <san@google.com>
San Mehat [Fri, 29 Jan 2010 13:35:35 +0000 (05:35 -0800)]
PackageManagerService: Refactor MountService calls (new api)
Signed-off-by: San Mehat <san@google.com>
San Mehat [Fri, 29 Jan 2010 13:34:01 +0000 (05:34 -0800)]
UsbStorageActivity: Refactor for new MountService API
Signed-off-by: San Mehat <san@google.com>
San Mehat [Fri, 29 Jan 2010 13:33:27 +0000 (05:33 -0800)]
sdutil: Refactor for new APIs
Signed-off-by: San Mehat <san@google.com>
San Mehat [Fri, 29 Jan 2010 13:32:19 +0000 (05:32 -0800)]
MountService: Massive bloat reduction and rewrite
- Most API calls now return an int as a result code (see MountServiceResultCode.java)
- All notification code has been removed
- All settings code has been removed
- Removed UMS centric API calls in favor of more generic 'shares'
- Mount error reporting is no longer done via an event, but is done as part of the
actual mount process
- Rework vold IPC commands to be more sane
Updated:
MountService: Rename MountServiceObserver -> MountServiceListener
MountService: Add support for Async callbacks
Updated:
MountService: Add BinderDeath handling
Updated:
MountService: Remove notifys since we dont listen anyways
Updated:
MountService: Fix bad cast
Signed-off-by: San Mehat <san@google.com>
San Mehat [Tue, 2 Feb 2010 19:15:55 +0000 (11:15 -0800)]
Merge "NativeDaemonConnector: Cleanup socket code and use a proper exception Signed-off-by: San Mehat <san@google.com>"
San Mehat [Tue, 2 Feb 2010 19:11:06 +0000 (11:11 -0800)]
Merge "StorageManager: Introduce StorageManager"
Andreas Huber [Tue, 2 Feb 2010 18:38:40 +0000 (10:38 -0800)]
Properly advertise the content length of the HTTP stream if available.
related-to-bug:
2312941
Grace Kloba [Mon, 1 Feb 2010 20:25:11 +0000 (12:25 -0800)]
Hide the android.webkit.CallbackProxy class from the API. This is a android.webkit package class and internal to our implementation.
Although not strictly a published API (the class does not appear in the docs), it has found it's way into the API through
the public, subclassable android.webkit.JsResult class where it is a protected member.
Based on changed from Ben.
Andrei Popescu [Tue, 2 Feb 2010 18:21:51 +0000 (10:21 -0800)]
Merge "Make sure application cache manifest files are not cached."
Andrei Popescu [Tue, 2 Feb 2010 15:59:26 +0000 (15:59 +0000)]
Make sure application cache manifest files are not cached.
Fix b:
2326937
Patrick Scott [Tue, 2 Feb 2010 17:46:44 +0000 (09:46 -0800)]
Merge "Check for null data after decoding a data: url."
Vasu Nori [Tue, 2 Feb 2010 17:38:52 +0000 (09:38 -0800)]
Merge "add instrumentation to log the sql statement + bindargs + databasename"
Mike Lockwood [Tue, 2 Feb 2010 16:43:52 +0000 (08:43 -0800)]
Merge "Fix for GPS engines without separate session and engine status events."
Mike Lockwood [Tue, 2 Feb 2010 16:41:52 +0000 (11:41 -0500)]
Fix for GPS engines without separate session and engine status events.
GPS_STATUS_SESSION_BEGIN now implies GPS_STATUS_ENGINE_ON
and GPS_STATUS_ENGINE_OFF now implies GPS_STATUS_SESSION_END.
Change-Id: I7217dc5213ae9a5658ac81b0a14b61d3e36ca0f6
Signed-off-by: Mike Lockwood <lockwood@android.com>
Doug Zongker [Tue, 2 Feb 2010 16:26:07 +0000 (08:26 -0800)]
Merge "Revert "adding OAuth library""
Patrick Scott [Tue, 2 Feb 2010 16:19:25 +0000 (11:19 -0500)]
Check for null data after decoding a data: url.
Refactor StreamLoader and friends since they all use a Context. Change the
successful status to 200 instead of 0. Not sure why it was ever 0.
Bug:
2364322
Mike Lockwood [Tue, 2 Feb 2010 14:15:37 +0000 (09:15 -0500)]
resolved conflicts for merge of
21875ab3 to master
Change-Id: I447e813b3ec460bbc9050de6b95bd663bb33c86f
Andrei Popescu [Mon, 1 Feb 2010 22:32:16 +0000 (22:32 +0000)]
Implement support for v8 counters
Bjorn Bringert [Tue, 2 Feb 2010 10:03:39 +0000 (02:03 -0800)]
Merge "Restore search UI layout to get search button back"
Vasu Nori [Sat, 30 Jan 2010 00:24:23 +0000 (16:24 -0800)]
add instrumentation to log the sql statement + bindargs + databasename
capture the sql statement along with the bindargs passed in. this will help
one to see the sql statements being executed and hopefully will help
debug incorrect-sql bugs.
James Dong [Tue, 2 Feb 2010 06:48:36 +0000 (22:48 -0800)]
Merge "Initial check-in for xml-based encoder capabilities retrieval - Changed the Java API as suggested - Treat /etc/media_profiles.xml as the default xml configurtion file"
James Dong [Wed, 20 Jan 2010 01:45:38 +0000 (17:45 -0800)]
Initial check-in for xml-based encoder capabilities retrieval
- Changed the Java API as suggested
- Treat /etc/media_profiles.xml as the default xml configurtion file
Dirk Balfanz [Tue, 2 Feb 2010 01:47:48 +0000 (17:47 -0800)]
Revert "adding OAuth library"
This reverts commit
cc1aa994af5957815e47ec102a0eab3b98111eb1.
Mathias Agopian [Tue, 2 Feb 2010 01:39:54 +0000 (17:39 -0800)]
Merge "fix [
2397853] glCopyTexImage2D crashes emulator"
Jeff Hamilton [Wed, 6 Jan 2010 21:46:38 +0000 (15:46 -0600)]
Add the --rename-manifest-package option to aapt.
It allows you to force override the manifest
package listed in the AndroidManifest.xml when
creating an APK file.
Change-Id: I7eac7943c4e56610b65728ae54773a273634fd9d
Wink Saville [Mon, 1 Feb 2010 23:42:52 +0000 (15:42 -0800)]
Cleanup comments, see bug
2401350.
Change-Id: Ieaeeba44b235038ad9b75a57b37658738532df3f
Mike LeBeau [Mon, 1 Feb 2010 23:54:16 +0000 (15:54 -0800)]
Merge "Provide another extra for ACTION_VOICE_SEARCH_RESULTS that indicates the base url to be used when interpreting html results given in EXTRA_VOICE_SEARCH_RESULT_HTML."
Chris Tate [Mon, 1 Feb 2010 23:53:34 +0000 (15:53 -0800)]
Merge "Streamline: use Messages sent to a Handler subclass instead of posting Runnables"
Grace Kloba [Mon, 1 Feb 2010 23:35:34 +0000 (15:35 -0800)]
Merge "Remove the obsolete unused hidden constant."
Christopher Tate [Mon, 1 Feb 2010 23:31:09 +0000 (15:31 -0800)]
Streamline: use Messages sent to a Handler subclass instead of posting Runnables
Change-Id: I0ecbd2145300962839c0f87b761768a3bca4f010
Joe Onorato [Mon, 1 Feb 2010 23:26:25 +0000 (15:26 -0800)]
Merge "Fix bug
2362761 AppWidgetService should use Intent.setPackage()"
Joe Onorato [Mon, 1 Feb 2010 23:24:46 +0000 (18:24 -0500)]
Fix bug
2362761 AppWidgetService should use Intent.setPackage()
Thanks Bjorn for the tip.
Joe Onorato [Mon, 1 Feb 2010 23:15:19 +0000 (15:15 -0800)]
Merge "Fix bug
2389454 - DateTimeView can NPE if "date_format" isn't set in Settings."
Joe Onorato [Mon, 1 Feb 2010 23:14:15 +0000 (18:14 -0500)]
Fix bug
2389454 - DateTimeView can NPE if "date_format" isn't set in Settings.
Grace Kloba [Mon, 1 Feb 2010 22:53:23 +0000 (14:53 -0800)]
Remove the obsolete unused hidden constant.
Mike LeBeau [Mon, 1 Feb 2010 23:03:54 +0000 (15:03 -0800)]
Provide another extra for ACTION_VOICE_SEARCH_RESULTS that indicates
the base url to be used when interpreting html results given in
EXTRA_VOICE_SEARCH_RESULT_HTML.
Shimeng (Simon) Wang [Thu, 28 Jan 2010 23:05:51 +0000 (15:05 -0800)]
Anchor the page at top left corner when webView size changed.
Bug:
2356891
modified: core/java/android/webkit/WebView.java
Romain Guy [Mon, 1 Feb 2010 22:56:19 +0000 (14:56 -0800)]
Do not reshow the filter popup after hiding it.
This was causing the popup to show after moving a list out of the screen in
the new music app.
John Wang [Mon, 1 Feb 2010 22:34:50 +0000 (14:34 -0800)]
am
1ef6fb3b: am
8deed914: Merge "Handle RIL_UNSOL_RESEND_INCALL_MUTE." into eclair
Merge commit '
1ef6fb3bbe17870673195f28eec9d1e4e43b4785'
* commit '
1ef6fb3bbe17870673195f28eec9d1e4e43b4785':
Handle RIL_UNSOL_RESEND_INCALL_MUTE.
Bjorn Bringert [Mon, 1 Feb 2010 22:32:21 +0000 (22:32 +0000)]
Restore search UI layout to get search button back
This reverts commit
aa0cfa7b6bf8000c59ceca2f9b698103e553d402.
Change-Id: Ia58b6ac4778c1c376db144f6c5bde22adbc41c10
Adam Powell [Mon, 1 Feb 2010 22:24:18 +0000 (14:24 -0800)]
Merge "Overscrolling in AbsListView; visibility cleanup for FlingRunnable"
Adam Powell [Fri, 29 Jan 2010 05:22:20 +0000 (21:22 -0800)]
Overscrolling in AbsListView; visibility cleanup for FlingRunnable
Mathias Agopian [Mon, 1 Feb 2010 21:45:08 +0000 (13:45 -0800)]
fix [
2397853] glCopyTexImage2D crashes emulator
Fixed a typo which would cause a buffer overflow
Andreas Huber [Mon, 1 Feb 2010 21:02:58 +0000 (13:02 -0800)]
Merge "Use physical memory for software rendering to take a fast path through surface flinger if possible."
Andreas Huber [Mon, 1 Feb 2010 21:02:39 +0000 (13:02 -0800)]
Merge "The TI MP3 decoder lies about the number of channels it outputs, add a quirk for that."
Mike LeBeau [Mon, 1 Feb 2010 20:59:31 +0000 (12:59 -0800)]
Merge "Add a set of hidden constants for the ACTION_VOICE_SEARCH_RESULTS intent. This will not be unhidden for Froyo as nothing will implement it until later, but I wanted to have the definition explicit in the framework."
Amith Yamasani [Mon, 1 Feb 2010 20:37:58 +0000 (12:37 -0800)]
Merge "Fix an NPE in SearchDialog when clicking on Mic button. Bug:
2410605"
Mike Lockwood [Mon, 1 Feb 2010 20:36:21 +0000 (12:36 -0800)]
Merge "Remove unused method LocationProviderImpl.isEnabled()."
Mike Lockwood [Mon, 1 Feb 2010 20:34:52 +0000 (15:34 -0500)]
Remove unused method LocationProviderImpl.isEnabled().
This should have been removed in my previous change.
Change-Id: I3a080888f995e77a61e3ebf1c194ccd65686af1e
Signed-off-by: Mike Lockwood <lockwood@android.com>
Amith Yamasani [Mon, 1 Feb 2010 20:13:39 +0000 (12:13 -0800)]
Fix an NPE in SearchDialog when clicking on Mic button. Bug:
2410605
Mathias Agopian [Mon, 1 Feb 2010 20:08:10 +0000 (12:08 -0800)]
Merge "Don't use MemoryDealer in MetadataRetrieverClient as it's not necessary."
Mathias Agopian [Mon, 1 Feb 2010 20:07:56 +0000 (12:07 -0800)]
Merge "Don't use the MemoryDealer in CursorWindow, it's not necessary."
Mike LeBeau [Sun, 31 Jan 2010 20:28:07 +0000 (12:28 -0800)]
Add a set of hidden constants for the ACTION_VOICE_SEARCH_RESULTS intent.
This will not be unhidden for Froyo as nothing will implement it until
later, but I wanted to have the definition explicit in the framework.
Oscar Montemayor [Mon, 1 Feb 2010 19:36:04 +0000 (11:36 -0800)]
Apps on SD project.
Javadoc fixes for new method in PackageManager class.
Mike Lockwood [Mon, 1 Feb 2010 19:03:09 +0000 (11:03 -0800)]
Merge "Remove ILocationProvider.isEnabled() binder call and use cached value instead."
Andreas Huber [Fri, 29 Jan 2010 22:56:33 +0000 (14:56 -0800)]
Use physical memory for software rendering to take a fast path through surface flinger if possible.
related-to-bug:
2386023
Andreas Huber [Mon, 1 Feb 2010 18:51:50 +0000 (10:51 -0800)]
The TI MP3 decoder lies about the number of channels it outputs, add a quirk for that.
San Mehat [Mon, 1 Feb 2010 18:21:32 +0000 (10:21 -0800)]
StorageManager: Introduce StorageManager
StorageManager provides an API for applications to receive storage
notifications on the app main thread.
Signed-off-by: San Mehat <san@google.com>
Maryam Garrett [Mon, 1 Feb 2010 18:09:42 +0000 (10:09 -0800)]
Merge "Remove 2 unused imports."