Commit Graph

12499 Commits

Author SHA1 Message Date
San Mehat
498479a8fe Merge "StorageManager: API_CHANGE: Move StorageManager into android.storage" 2010-02-02 13:31:16 -08:00
Andreas Huber
2214292604 Merge "Properly report the duration of a recording into .mp4 files." 2010-02-02 13:01:07 -08:00
Oscar Montemayor
0c70a7d927 Merge "Apps on SD project. Javadoc fixes for new method in PackageManager class." 2010-02-02 12:15:26 -08:00
Grace Kloba
a630ac88af Merge "Now mSupportMultiTouch is depending on WebSettings, it can't be static any more." 2010-02-02 11:59:38 -08:00
Andreas Huber
b787383ba5 Merge "Properly advertise the content length of the HTTP stream if available." 2010-02-02 11:38:19 -08:00
San Mehat
d6cb0157b7 Merge "NativeDaemonConnector: Cleanup socket code and use a proper exception Signed-off-by: San Mehat <san@google.com>" 2010-02-02 11:15:55 -08:00
San Mehat
6ed137e6c8 Merge "StorageManager: Introduce StorageManager" 2010-02-02 11:11:06 -08:00
Andrei Popescu
bca2005fa5 Merge "Make sure application cache manifest files are not cached." 2010-02-02 10:21:51 -08:00
Patrick Scott
18e83f9462 Merge "Check for null data after decoding a data: url." 2010-02-02 09:46:44 -08:00
Vasu Nori
f310eb6369 Merge "add instrumentation to log the sql statement + bindargs + databasename" 2010-02-02 09:38:52 -08:00
Mike Lockwood
93dfb71e09 Merge "Fix for GPS engines without separate session and engine status events." 2010-02-02 08:43:52 -08:00
Doug Zongker
6c3aee30c4 Merge "Revert "adding OAuth library"" 2010-02-02 08:26:07 -08:00
Mike Lockwood
ec5e52d404 resolved conflicts for merge of 21875ab3 to master
Change-Id: I447e813b3ec460bbc9050de6b95bd663bb33c86f
2010-02-02 09:15:37 -05:00
Bjorn Bringert
96ac81e893 Merge "Restore search UI layout to get search button back" 2010-02-02 02:03:39 -08:00
James Dong
7bb174354d 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
Mathias Agopian
658cc21f11 Merge "fix [2397853] glCopyTexImage2D crashes emulator" 2010-02-01 17:39:54 -08:00
Mike LeBeau
82f2a4e281 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
f56044f9d9 Merge "Streamline: use Messages sent to a Handler subclass instead of posting Runnables" 2010-02-01 15:53:34 -08:00
Grace Kloba
ba1981e8e1 Merge "Remove the obsolete unused hidden constant." 2010-02-01 15:35:34 -08:00
Joe Onorato
b91a98f1ef Merge "Fix bug 2362761 AppWidgetService should use Intent.setPackage()" 2010-02-01 15:26:25 -08:00
Joe Onorato
a5a4d035ad Merge "Fix bug 2389454 - DateTimeView can NPE if "date_format" isn't set in Settings." 2010-02-01 15:15:19 -08:00
John Wang
757be08ea7 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
Adam Powell
60aad2b205 Merge "Overscrolling in AbsListView; visibility cleanup for FlingRunnable" 2010-02-01 14:24:18 -08:00
Mathias Agopian
fda42f318a fix [2397853] glCopyTexImage2D crashes emulator
Fixed a typo which would cause a buffer overflow
2010-02-01 13:45:08 -08:00
Andreas Huber
d45e93d4ff 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
2bd4e32932 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
0ffede5989 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
bbe28bfe63 Merge "Fix an NPE in SearchDialog when clicking on Mic button. Bug: 2410605" 2010-02-01 12:37:58 -08:00
Mike Lockwood
52b8ff65c3 Merge "Remove unused method LocationProviderImpl.isEnabled()." 2010-02-01 12:36:21 -08:00
Mathias Agopian
51ee7eb55b Merge "Don't use MemoryDealer in MetadataRetrieverClient as it's not necessary." 2010-02-01 12:08:11 -08:00
Mathias Agopian
4a14dd5fe8 Merge "Don't use the MemoryDealer in CursorWindow, it's not necessary." 2010-02-01 12:07:56 -08:00
Mike Lockwood
e48e234dc0 Merge "Remove ILocationProvider.isEnabled() binder call and use cached value instead." 2010-02-01 11:03:09 -08:00
Maryam Garrett
adc6d09816 Merge "Remove 2 unused imports." 2010-02-01 10:09:42 -08:00
Maryam Garrett
4efd5c1e67 Remove 2 unused imports.
Change-Id: I4ada5f3dccdbb2e7ede29693f7211068808f2d75
2010-02-01 11:47:45 -05:00
Mike Lockwood
6eb975c180 Merge "Add resources to specify package name for network location and geocode providers." 2010-02-01 02:45:19 -08:00
Wu-cheng Li
fdef2fb051 Merge "Add float support for set and get in CameraParameters." 2010-01-31 06:09:14 -08:00
Wu-cheng Li
391f3f8b5e Add float support for set and get in CameraParameters.
bug:2375989
bug:2375987
2010-01-31 17:03:10 +08:00
Wu-cheng Li
077c40fee3 Add focal length and view angle API.
bug:2375989,2375987
2010-01-30 20:36:04 +08:00
Mike Lockwood
5378838b0b am a0460004: Merge "Ignore NTP time fixes that differ from system time by more than 5 minutes." into eclair
Merge commit 'a0460004aae7576114639393a230f18608d213e6' into eclair-plus-aosp

* commit 'a0460004aae7576114639393a230f18608d213e6':
  Ignore NTP time fixes that differ from system time by more than 5 minutes.
2010-01-29 20:12:21 -08:00
John Wang
a74f6908c6 am 8deed914: Merge "Handle RIL_UNSOL_RESEND_INCALL_MUTE." into eclair
Merge commit '8deed914c2df15d71674deae591bcd3313093931' into eclair-plus-aosp

* commit '8deed914c2df15d71674deae591bcd3313093931':
  Handle RIL_UNSOL_RESEND_INCALL_MUTE.
2010-01-29 20:12:15 -08:00
Mike Lockwood
97c0df6c31 Merge "Ignore NTP time fixes that differ from system time by more than 5 minutes." into eclair 2010-01-29 20:09:16 -08:00
John Wang
2d15d737b7 Merge "Handle RIL_UNSOL_RESEND_INCALL_MUTE." into eclair 2010-01-29 20:07:14 -08:00
Dianne Hackborn
b0b1eff2bc Merge "Fix sample code insertion." 2010-01-29 19:13:11 -08:00
Jim Miller
853f6957dd am 3a8a2818: am d8a3a895: Fix 2404771: Expose reset() in SlidingTab widget so we can reset it when we get an incoming call.
Merge commit '3a8a28185bc26ccfdf847016d5a40af35436ca97'

* commit '3a8a28185bc26ccfdf847016d5a40af35436ca97':
  Fix 2404771: Expose reset() in SlidingTab widget so we can reset it when we get an incoming call.
2010-01-29 18:12:47 -08:00
Jim Miller
8fee03b1f0 am d8a3a895: Fix 2404771: Expose reset() in SlidingTab widget so we can reset it when we get an incoming call.
Merge commit 'd8a3a8957b9d71ab75584b0cc98324fd70cc527c' into eclair-plus-aosp

* commit 'd8a3a8957b9d71ab75584b0cc98324fd70cc527c':
  Fix 2404771: Expose reset() in SlidingTab widget so we can reset it when we get an incoming call.
2010-01-29 18:06:48 -08:00
Dianne Hackborn
a6f4f9e5f2 Merge "Fix SDK build." 2010-01-29 17:39:06 -08:00
Dmitri Plotnikov
032cc4fcc5 Merge "Adding system preferences for contacts: sort order and display order." 2010-01-29 17:37:05 -08:00
Oscar Montemayor
a92ee47866 Merge "Apps on SD card project. Refactored recommendAppInstallLocation(..) method in PackageManager by making it an instance method. Since PackageManager has only abstarct instance methods, moved implementation to ApplicationContext.ApplicationPackageManager class, in line with the rest of the method implementations. Tah way, chage is consistent with best coding practices. Also MockPackageManager received the additional method." 2010-01-29 16:50:21 -08:00
Neal Nguyen
82cc4fd2ff Merge "Phase 2 of test cleanup: moving test files from AndroidTests closer to their sources." 2010-01-29 16:38:53 -08:00
Andy McFadden
cceeb6d6bb Merge "Added dumpHprofDataDdms() call." 2010-01-29 16:33:19 -08:00