17972 Commits

Author SHA1 Message Date
San Mehat
476387613b Merge "StorageManager: Introduce StorageManager" 2010-02-02 11:11:06 -08:00
Andreas Huber
8cc1b2a32c Properly advertise the content length of the HTTP stream if available.
related-to-bug: 2312941
2010-02-02 10:38:40 -08:00
Mike Chan
18d200fd2a BatteryStatsImpl: initalize audio timer
Signed-off-by: Mike Chan <mike@android.com>
2010-02-02 10:33:45 -08:00
Grace Kloba
2df9a91ff5 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.
2010-02-02 10:30:23 -08:00
Andrei Popescu
3565456ca7 Merge "Make sure application cache manifest files are not cached." 2010-02-02 10:21:51 -08:00
Andrei Popescu
a1ba11bd78 Make sure application cache manifest files are not cached.
Fix b:2326937
2010-02-02 18:10:35 +00:00
Patrick Scott
c209ccf460 Merge "Check for null data after decoding a data: url." 2010-02-02 09:46:44 -08:00
Vasu Nori
8fccf67fa5 Merge "add instrumentation to log the sql statement + bindargs + databasename" 2010-02-02 09:38:52 -08:00
Mike Lockwood
8a838531cc Merge "Fix for GPS engines without separate session and engine status events." 2010-02-02 08:43:52 -08:00
Mike Lockwood
271f9f172b 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>
2010-02-02 11:41:52 -05:00
Doug Zongker
5d33e6e602 Merge "Revert "adding OAuth library"" 2010-02-02 08:26:07 -08:00
Patrick Scott
8af3cfc2a4 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
2010-02-02 11:20:54 -05:00
Mike Lockwood
5310b36a37 resolved conflicts for merge of 21875ab3 to master
Change-Id: I447e813b3ec460bbc9050de6b95bd663bb33c86f
2010-02-02 09:15:37 -05:00
Andrei Popescu
5e7bb0a9ca Implement support for v8 counters 2010-02-02 11:40:20 +00:00
Bjorn Bringert
b83e68c95b Merge "Restore search UI layout to get search button back" 2010-02-02 02:03:39 -08:00
Vasu Nori
4dd4ab4cc3 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.
2010-02-01 23:05:33 -08:00
James Dong
705300b842 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" 2010-02-01 22:48:36 -08:00
James Dong
c371194e4e 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
2010-02-01 22:38:37 -08:00
Dirk Balfanz
e599a9d24b Revert "adding OAuth library"
This reverts commit cc1aa994af5957815e47ec102a0eab3b98111eb1.
2010-02-01 17:47:48 -08:00
Mathias Agopian
1b7a47c911 Merge "fix [2397853] glCopyTexImage2D crashes emulator" 2010-02-01 17:39:54 -08:00
Jeff Hamilton
2fee0ed6eb 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
2010-02-01 18:47:01 -06:00
Wink Saville
7188f94652 Cleanup comments, see bug 2401350.
Change-Id: Ieaeeba44b235038ad9b75a57b37658738532df3f
2010-02-01 16:26:00 -08:00
Mike LeBeau
d615c6f330 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." 2010-02-01 15:54:16 -08:00
Chris Tate
125d4072d8 Merge "Streamline: use Messages sent to a Handler subclass instead of posting Runnables" 2010-02-01 15:53:34 -08:00
Grace Kloba
34d7a9fbf5 Merge "Remove the obsolete unused hidden constant." 2010-02-01 15:35:34 -08:00
Christopher Tate
d3cd359122 Streamline: use Messages sent to a Handler subclass instead of posting Runnables
Change-Id: I0ecbd2145300962839c0f87b761768a3bca4f010
2010-02-01 15:31:09 -08:00
Joe Onorato
e641a76758 Merge "Fix bug 2362761 AppWidgetService should use Intent.setPackage()" 2010-02-01 15:26:25 -08:00
Joe Onorato
f6133febae Fix bug 2362761 AppWidgetService should use Intent.setPackage()
Thanks Bjorn for the tip.
2010-02-01 18:24:46 -05:00
Joe Onorato
1f9a3cc338 Merge "Fix bug 2389454 - DateTimeView can NPE if "date_format" isn't set in Settings." 2010-02-01 15:15:19 -08:00
Joe Onorato
7747210426 Fix bug 2389454 - DateTimeView can NPE if "date_format" isn't set in Settings. 2010-02-01 18:14:15 -05:00
Grace Kloba
e8fe0e35e5 Remove the obsolete unused hidden constant. 2010-02-01 15:08:40 -08:00
Mike LeBeau
f9271c8b7d 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.
2010-02-01 15:07:13 -08:00
Shimeng (Simon) Wang
8a7ac8db1a Anchor the page at top left corner when webView size changed.
Bug: 2356891
	modified:   core/java/android/webkit/WebView.java
2010-02-01 15:06:38 -08:00
Romain Guy
2456248712 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.
2010-02-01 14:58:06 -08:00
John Wang
6a31dfa905 am 1ef6fb3b: am 8deed914: Merge "Handle RIL_UNSOL_RESEND_INCALL_MUTE." into eclair
Merge commit '1ef6fb3bbe17870673195f28eec9d1e4e43b4785'

* commit '1ef6fb3bbe17870673195f28eec9d1e4e43b4785':
  Handle RIL_UNSOL_RESEND_INCALL_MUTE.
2010-02-01 14:34:50 -08:00
Bjorn Bringert
4a2b498766 Restore search UI layout to get search button back
This reverts commit aa0cfa7b6bf8000c59ceca2f9b698103e553d402.

Change-Id: Ia58b6ac4778c1c376db144f6c5bde22adbc41c10
2010-02-01 22:32:56 +00:00
Adam Powell
e4e460f67b Merge "Overscrolling in AbsListView; visibility cleanup for FlingRunnable" 2010-02-01 14:24:18 -08:00
Adam Powell
79ac3395b5 Overscrolling in AbsListView; visibility cleanup for FlingRunnable 2010-02-01 14:19:31 -08:00
Mathias Agopian
9c84720da0 fix [2397853] glCopyTexImage2D crashes emulator
Fixed a typo which would cause a buffer overflow
2010-02-01 13:45:08 -08:00
Andreas Huber
5fdff9e6c5 Merge "Use physical memory for software rendering to take a fast path through surface flinger if possible." 2010-02-01 13:02:58 -08:00
Andreas Huber
8ef96af97e Merge "The TI MP3 decoder lies about the number of channels it outputs, add a quirk for that." 2010-02-01 13:02:39 -08:00
Mike LeBeau
54ab1fadfa 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." 2010-02-01 12:59:31 -08:00
Amith Yamasani
504e07134e Merge "Fix an NPE in SearchDialog when clicking on Mic button. Bug: 2410605" 2010-02-01 12:37:58 -08:00
Mike Lockwood
25b910839e Merge "Remove unused method LocationProviderImpl.isEnabled()." 2010-02-01 12:36:21 -08:00
Mike Lockwood
56fcd69b14 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>
2010-02-01 15:34:52 -05:00
Amith Yamasani
0f55b197aa Fix an NPE in SearchDialog when clicking on Mic button. Bug: 2410605 2010-02-01 12:13:39 -08:00
Mathias Agopian
beee4950fb Merge "Don't use MemoryDealer in MetadataRetrieverClient as it's not necessary." 2010-02-01 12:08:11 -08:00
Mathias Agopian
2c94dac323 Merge "Don't use the MemoryDealer in CursorWindow, it's not necessary." 2010-02-01 12:07:56 -08:00
Mike LeBeau
41b14e8ff7 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.
2010-02-01 11:54:11 -08:00
Oscar Montemayor
cdc428bdb7 Apps on SD project.
Javadoc fixes for new method in PackageManager class.
2010-02-01 11:36:04 -08:00