Commit Graph

12957 Commits

Author SHA1 Message Date
Robert Greenwalt
0c88f3f859 Merge "Update Tethering." 2010-02-16 17:11:10 -08:00
Chris Tate
df60c00e3e Merge "API CHANGE: expose backup/restore to the SDK" 2010-02-16 16:58:17 -08:00
Dave Sparks
e585432a1d Merge "Add SoundPool API to pause and resume all active streams. Bug 2426531." 2010-02-16 16:41:19 -08:00
Mike LeBeau
39696474d7 Merge "Add constant to android-common for voice search's EXTRA_CALLING_PACKAGE, and use it from SearchDialog." 2010-02-16 16:10:09 -08:00
Suchi Amalapurapu
37dd0df785 Merge "Move mount service wrapper calls to PackageHelper" 2010-02-16 16:08:00 -08:00
Daisuke Miyakawa
5fe91a6c6d Merge "Fixing the use of entities in VCardExporter." 2010-02-16 14:55:08 -08:00
Jean-Baptiste Queru
0177eb076b Merge "fix build" 2010-02-16 14:49:44 -08:00
Eric Fischer
c57baa4cc6 Merge "Keep Rfc822Tokenizer from crashing when the string ends with a backslash." 2010-02-16 14:47:23 -08:00
Andreas Huber
6d54a23500 Merge "If we never triggered a range request but know the content length make sure to not read more data than there could be, otherwise we'd block indefinitely if the server doesn't close the connection." 2010-02-16 14:41:14 -08:00
Andreas Huber
f3f3f9f7d9 Merge "Don't hold the prefetcher mutex while prefetching a single source, the lock protects the list of sources and does not guard access to the individual sources." 2010-02-16 14:36:45 -08:00
Jean-Baptiste Queru
d968e6ff6e Merge "Expose more Download Manager APIs." 2010-02-16 14:02:31 -08:00
Mathias Agopian
713e2f1bf5 Merge "minor cleanup." 2010-02-16 12:56:56 -08:00
Kenny Root
e2fde25f97 Merge "Fix off-by-one in parse3339 timezone check" 2010-02-16 12:56:29 -08:00
android-build SharedAccount
2c6cb3db27 am 5d72a8dd: cherry pick d60e29009c1049a9776e6630e9489e1ef3f83491
Merge commit '5d72a8dda22cdb0c8e1ded1ca5e5122b0c25bcc7' into eclair-plus-aosp

* commit '5d72a8dda22cdb0c8e1ded1ca5e5122b0c25bcc7':
  cherry pick d60e29009c1049a9776e6630e9489e1ef3f83491
2010-02-16 12:53:04 -08:00
Adam Powell
c7369e21d2 Merge "Fix for [Horizontal]ScrollView scroll range reporting" 2010-02-16 12:36:29 -08:00
Andreas Huber
b7ac6f895d Merge "The AMRSource failed to properly release a media buffer in case of error." 2010-02-16 11:48:33 -08:00
Bjorn Bringert
fe2c163fdf Merge "Remove flaky and broken search tests from continous" 2010-02-16 11:43:23 -08:00
James Dong
23caba5f3c Merge "Support decoder queries from media profiles xml configuration file" 2010-02-16 10:59:13 -08:00
Dianne Hackborn
e1e254b401 Merge "Small oom_adj tweaks." 2010-02-16 10:55:30 -08:00
Shimeng (Simon) Wang
caa1551875 Merge "Enhance URL regular expression to match more Unicode chars." 2010-02-16 10:49:37 -08:00
Adam Powell
8b77bd8655 Merge "VelocityTracker now uses pointer id instead of index when referring to multiple pointers. VelocityTracker now correctly handles multitouch. Addresses http://b/issue?id=2439030" 2010-02-16 10:14:05 -08:00
Adam Powell
03d488417c Merge "Added proper overscrolling scroll bar behavior to GridView" 2010-02-16 10:13:52 -08:00
Paul Westbrook
3c6de947ed Merge "Download Manager API to support Gmail" 2010-02-16 09:52:08 -08:00
Doug Zongker
d35e6159bf Merge "remove Base64 from android-common" 2010-02-16 09:28:03 -08:00
Suchi Amalapurapu
8516559109 Merge "Include install location preference when installing packages. Changes include Add new remote call in default container service to determine install location. Rename INSTALL_ON_SDCARD Remove recommentAppInstall method Add some additional flags used in remote stubs. Move check for protected apps prior to copy. Unit tests" 2010-02-16 09:23:51 -08:00
Doug Zongker
f82f501d85 use framework base64 implementation
Change-Id: Ib1dc595e53d64901f81d06350c6ab9b138beff7e
2010-02-16 08:52:31 -08:00
Doug Zongker
5b7bad3b32 Merge "tweak the Base64 implementation" 2010-02-16 08:49:38 -08:00
Doug Zongker
53fc61801e remove Base64 from android-common
This is now available in the framework as android.util.base64.*;

Change-Id: I54901d32b2b5b291cfa0b4c2479b805038ba12ac
2010-02-14 15:31:27 -08:00
Wink Saville
cf920369f6 am 58d6a20c: am 6b178e47: Merge "Always assume evdoXxxx signal strength values are correct." into eclair
Merge commit '58d6a20cfaa55ebe269ac0736999b90c3227b0c1'

* commit '58d6a20cfaa55ebe269ac0736999b90c3227b0c1':
  Always assume evdoXxxx signal strength values are correct.
2010-02-13 09:48:43 -08:00
Wink Saville
4ab4ebc9ae am 6b178e47: Merge "Always assume evdoXxxx signal strength values are correct." into eclair
Merge commit '6b178e472266052b4a9b28b1e4a5cef07f1ebf8b' into eclair-plus-aosp

* commit '6b178e472266052b4a9b28b1e4a5cef07f1ebf8b':
  Always assume evdoXxxx signal strength values are correct.
2010-02-13 09:42:07 -08:00
Wink Saville
0814cdd0c7 Merge "Always assume evdoXxxx signal strength values are correct." into eclair 2010-02-13 09:36:17 -08:00
Mathias Agopian
c9e4a12546 minor cleanup. 2010-02-12 18:50:28 -08:00
Xavier Ducrohet
8baa5d1443 am ddcf25ea: (-s ours) am 2be56ccb: Merge "Add --auto-add-overlay option to aapt. DO NOT MERGE" into eclair
Merge commit 'ddcf25ea7e1b21b908da73000630c72d6fa146b4'

* commit 'ddcf25ea7e1b21b908da73000630c72d6fa146b4':
  Add --auto-add-overlay option to aapt. DO NOT MERGE
2010-02-12 17:55:17 -08:00
Xavier Ducrohet
0256b03e6e am 2be56ccb: Merge "Add --auto-add-overlay option to aapt. DO NOT MERGE" into eclair
Merge commit '2be56ccbcff9d5f7b9b3cc0fed3825d4f037ff6a' into eclair-plus-aosp

* commit '2be56ccbcff9d5f7b9b3cc0fed3825d4f037ff6a':
  Add --auto-add-overlay option to aapt. DO NOT MERGE
2010-02-12 17:52:28 -08:00
Dianne Hackborn
8f281cc4bc Fix MotionEvent pointer API.
Ooops.  The API said that the pointer down and up actions contained
the pointer id, but it is actually the index.  Actually it makes
much more sense for it to be the index, and those ACTION_POINTER_1_DOWN
etc. constants were stupid.
2010-02-12 17:52:22 -08:00
Mike LeBeau
9b9deb3f68 Add constant to android-common for voice search's EXTRA_CALLING_PACKAGE,
and use it from SearchDialog.
2010-02-12 17:51:31 -08:00
Xavier Ducrohet
b22079f7f9 Merge "Add --auto-add-overlay option to aapt. DO NOT MERGE" into eclair 2010-02-12 17:48:36 -08:00
Doug Zongker
fbdd609ce8 Merge "@hide the bizarro Base64 stream constructors" 2010-02-12 17:45:45 -08:00
Jason Sams
89d2a45c5d Merge "Add comment block matching the type defines added by RS." 2010-02-12 17:26:46 -08:00
Gloria Wang
a3a217c9ba Merge "Replace Tremor with Tremolo (an ARM optimised version of the Tremor library for doing Ogg Vorbis decompression)" 2010-02-12 17:04:29 -08:00
Chris Tate
30b2ff0d44 Merge "Remove BACKUP_DATA permission and associated checks" 2010-02-12 16:30:39 -08:00
Gilles Debunne
02cbfe3434 Merge "Closed tabs removed from layout." 2010-02-12 15:50:05 -08:00
Scott Main
eabc8a4830 am de7b14f9: am 19bc31c3: Merge "docs: remove old tutorial and sample pages from the sitemap" into eclair
Merge commit 'de7b14f9ab3df84bcb6af0775e96cab02648cbd9'

* commit 'de7b14f9ab3df84bcb6af0775e96cab02648cbd9':
  docs: remove old tutorial and sample pages from the sitemap
2010-02-12 15:35:58 -08:00
Mike LeBeau
ff2a90c043 Merge "Really fix the build - one more change to SearchDialog which shouldn't have been submitted." 2010-02-12 15:30:42 -08:00
Scott Main
06286aac08 am 19bc31c3: Merge "docs: remove old tutorial and sample pages from the sitemap" into eclair
Merge commit '19bc31c32d75ebebacd85cac2cf4c31108329613' into eclair-plus-aosp

* commit '19bc31c32d75ebebacd85cac2cf4c31108329613':
  docs: remove old tutorial and sample pages from the sitemap
2010-02-12 15:29:27 -08:00
Mike LeBeau
864ff34522 Merge "Oops, unbreak the build by removing Recognition.java, not intended for submission at this time." 2010-02-12 15:27:12 -08:00
Mike LeBeau
5996f7baa8 Oops, unbreak the build by removing Recognition.java, not intended for
submission at this time.
2010-02-12 15:26:22 -08:00
Scott Main
4c4334d5c4 Merge "docs: remove old tutorial and sample pages from the sitemap" into eclair 2010-02-12 15:25:44 -08:00
Jim Miller
b946f11038 Merge "Watch 2274882: Add a field to the db when we wipe due to an error in the upgrader." 2010-02-12 15:20:40 -08:00
Brad Fitzpatrick
812017e58f Merge "Log previous SQL statement also when logging "COMMIT;" operations." 2010-02-12 15:20:14 -08:00