22802 Commits

Author SHA1 Message Date
Neal Nguyen
73bbcc4d02 am e96e2358: am f541c62b: Merge "Adding a few host-based stress tests for Apps on SD." into froyo
Merge commit 'e96e235865830e2f0ee54e22feb20f26c3390999' into kraken

* commit 'e96e235865830e2f0ee54e22feb20f26c3390999':
  Adding a few host-based stress tests for Apps on SD.
2010-05-06 12:43:48 -07:00
Andreas Huber
71bd9fc81e am 100ef9be: Merge "Disable vorbis seek when streaming from localhost." into froyo
Merge commit '100ef9bee48c9beb83d885d233de6a42c64f55af' into froyo-plus-aosp

* commit '100ef9bee48c9beb83d885d233de6a42c64f55af':
  Disable vorbis seek when streaming from localhost.
2010-05-06 12:36:13 -07:00
Dirk Dougherty
8b6ac78e74 am 5305627d: Doc change: New doc that describes how market filters work
Merge commit '5305627d5b78b8d63ce344c4eb5d1a28ef44d3d0' into froyo-plus-aosp

* commit '5305627d5b78b8d63ce344c4eb5d1a28ef44d3d0':
  Doc change: New doc that describes how market filters work
2010-05-06 12:36:10 -07:00
Dan Bornstein
89ad07b048 am 42ee86e6: Merge "For issue #2651381, allow library prelinking." into froyo
Merge commit '42ee86e66d972dcdf240e549e5fdc151a144af64' into froyo-plus-aosp

* commit '42ee86e66d972dcdf240e549e5fdc151a144af64':
  For issue #2651381, allow library prelinking.
2010-05-06 12:36:05 -07:00
Neal Nguyen
e96e235865 am f541c62b: Merge "Adding a few host-based stress tests for Apps on SD." into froyo
Merge commit 'f541c62b2649a4b5641df77cda3f409e9ceeb0a2' into froyo-plus-aosp

* commit 'f541c62b2649a4b5641df77cda3f409e9ceeb0a2':
  Adding a few host-based stress tests for Apps on SD.
2010-05-06 12:36:01 -07:00
Andreas Huber
100ef9bee4 Merge "Disable vorbis seek when streaming from localhost." into froyo 2010-05-06 11:27:35 -07:00
Andreas Huber
62f7ffe106 Disable vorbis seek when streaming from localhost.
Change-Id: Icda523ae1c89e26482f1c1767fe3a8b9222bb30f
related-to-bug: 2654400
2010-05-06 10:31:57 -07:00
Dirk Dougherty
5305627d5b Doc change: New doc that describes how market filters work
Change-Id: I99696502b38d952df8fe07c8982d0cf6b95b31bd
2010-05-06 10:06:10 -07:00
Dan Bornstein
42ee86e66d Merge "For issue #2651381, allow library prelinking." into froyo 2010-05-06 10:01:39 -07:00
Neal Nguyen
f541c62b26 Merge "Adding a few host-based stress tests for Apps on SD." into froyo 2010-05-06 09:44:10 -07:00
Mike Lockwood
af7c978216 Merge "GpsLocationProvider: Store new Location before onGpsStatusChanged is sent" 2010-05-06 07:50:13 -07:00
Dan Egnor
08b3d2e5ef Make static versions of libutils and libbinder.
Fix some small static-initialization-order issues (and a static-
initializers-missing issue) that result from doing so.  The static
libraries don't actually get used for anything real at the moment --
they're used for perf tests of bug 2660235.

Bug: 2660235
Change-Id: Iee2f38f79cc93b395e8d0a5a144ed92461f5ada0
2010-05-06 01:03:31 -07:00
Dan Bornstein
782e9fd749 For issue #2651381, allow library prelinking.
Change-Id: I1cb467a158e21fc02cac6af585ac8d27c2bf42de
2010-05-05 18:23:05 -07:00
Simon Schoar
06daf19f6c Added WEB_URL_PATTERN for Montenegro ".me"
Change-Id: If725c5ee08ed840ae8323fa18b1d82ef2a42db87
2010-05-05 18:20:48 -07:00
Neal Nguyen
b1fb5c3011 Adding a few host-based stress tests for Apps on SD.
Change-Id: I0ccb1f3574688f60b6296dac6f6859ba5d0597ea
2010-05-05 18:17:35 -07:00
Suchi Amalapurapu
9c08d5c530 am 9dfc6971: am df7ccbc8: Merge "Fix 2656989. Clean up update to updated system applications." into froyo
Merge commit '9dfc6971631e306f6eec62b7c5f423ef52138b9c' into kraken

* commit '9dfc6971631e306f6eec62b7c5f423ef52138b9c':
  Fix 2656989. Clean up update to updated system applications.
2010-05-05 17:52:25 -07:00
Dan Bornstein
ebd2890b71 am 2a1674b1: am 2d315667: For issue #2651381, allow library prelinking.
Merge commit '2a1674b1d00fda68980ec834d6ce61aacd379bc8' into kraken

* commit '2a1674b1d00fda68980ec834d6ce61aacd379bc8':
  For issue #2651381, allow library prelinking.
2010-05-05 17:52:22 -07:00
Suchi Amalapurapu
9dfc697163 am df7ccbc8: Merge "Fix 2656989. Clean up update to updated system applications." into froyo
Merge commit 'df7ccbc8ff0d93a708a7fa1e57469d3f93ceda5c' into froyo-plus-aosp

* commit 'df7ccbc8ff0d93a708a7fa1e57469d3f93ceda5c':
  Fix 2656989. Clean up update to updated system applications.
2010-05-05 17:50:34 -07:00
Dan Bornstein
2a1674b1d0 am 2d315667: For issue #2651381, allow library prelinking.
Merge commit '2d315667ab733375d8c696f8c2f155bc1de9e4a2' into froyo-plus-aosp

* commit '2d315667ab733375d8c696f8c2f155bc1de9e4a2':
  For issue #2651381, allow library prelinking.
2010-05-05 17:50:28 -07:00
Suchi Amalapurapu
df7ccbc8ff Merge "Fix 2656989. Clean up update to updated system applications." into froyo 2010-05-05 17:38:58 -07:00
Jean-Baptiste Queru
7751667c68 Merge "Telephony: Add PUK MMI code support for CDMA RUIM phones" 2010-05-05 16:30:53 -07:00
Jean-Baptiste Queru
12849c8021 Merge "Type Zero Sms should not be displayed/stored/notified." 2010-05-05 16:18:30 -07:00
The Android Open Source Project
579e08e657 am f7896449: merge from open-source master
Merge commit 'f78964490d8098387d51444c87bf520ad3f674e2' into kraken

* commit 'f78964490d8098387d51444c87bf520ad3f674e2':
  Add new keycodes for the convenience of Japanese IMEs
  Call register_localized_collators() with the current locale.
  Fixed deserialization problem in DatePicker.
  Fix for bug 2467152 files with spaces fail to open.
  Set alpha value for newly created dim surface.
  telephony: Fix CID when CID is unknown
2010-05-05 16:00:01 -07:00
The Android Open Source Project
f78964490d merge from open-source master
Change-Id: Ia9e1f4e049f5870386ea29ddb6e3ef028ea918da
2010-05-05 15:57:42 -07:00
Jaikumar Ganesh
33232d26bb Merge "Add UUID property for adapter." into kraken 2010-05-05 15:25:54 -07:00
Dianne Hackborn
f41f444d12 Merge "First pass at NativeActivity." into kraken 2010-05-05 15:18:59 -07:00
Dianne Hackborn
69969e48f2 First pass at NativeActivity.
This is a rough sketch of the new pure-native API, which you can
use through a NativeActivity in your manifest (no Java code in
the .apk needed!).

Intentionally no docs yet, the API is still being seriously
messed with.  But it works.

Change-Id: I0e916d58a0d159ecaf3689e41834eb8dc681c0c0
2010-05-05 15:17:26 -07:00
Dan Bornstein
2d315667ab For issue #2651381, allow library prelinking.
Change-Id: I119348b55ad0015a286e9c94709977cd1973a7e1
2010-05-05 14:41:41 -07:00
Suchi Amalapurapu
c1d07d9beb Fix 2656989. Clean up update to updated system applications.
Change-Id: Ic66b00926c45fac43396f1f8f23d0865ba77faba
2010-05-05 14:06:17 -07:00
Jean-Baptiste Queru
1e936da287 Merge "Add new keycodes for the convenience of Japanese IMEs" 2010-05-05 13:49:58 -07:00
mogimo
b032bc0373 Add new keycodes for the convenience of Japanese IMEs
Change-Id: Ibd308cef11261147856258595f6ca0137e03e05c
2010-05-05 13:37:21 -07:00
Jean-Baptiste Queru
0938ef4215 Merge "telephony: Fix CID when CID is unknown" 2010-05-05 13:15:24 -07:00
Jean-Michel Trivi
99fb50468c am fc12b5be: am b5fa4dff: Merge "Fix bug 2594126 Do not crash when ViewRoot is trying to play a UI sound. This CL doesn\'t fix why mView can be null in the first place, but prevents a crash when mView is null and a UI sound is to be played." into froyo
Merge commit 'fc12b5be2ee49ba2392274d413bd5d759c03c346' into kraken

* commit 'fc12b5be2ee49ba2392274d413bd5d759c03c346':
  Fix bug 2594126 Do not crash when ViewRoot is trying to play a UI
2010-05-05 12:06:12 -07:00
Jean-Michel Trivi
fc12b5be2e am b5fa4dff: Merge "Fix bug 2594126 Do not crash when ViewRoot is trying to play a UI sound. This CL doesn\'t fix why mView can be null in the first place, but prevents a crash when mView is null and a UI sound is to be played." into froyo
Merge commit 'b5fa4dff0c4756ef7868926d4f373645ac0b00a9' into froyo-plus-aosp

* commit 'b5fa4dff0c4756ef7868926d4f373645ac0b00a9':
  Fix bug 2594126 Do not crash when ViewRoot is trying to play a UI
2010-05-05 12:03:43 -07:00
Jean-Michel Trivi
b5fa4dff0c Merge "Fix bug 2594126 Do not crash when ViewRoot is trying to play a UI sound. This CL doesn't fix why mView can be null in the first place, but prevents a crash when mView is null and a UI sound is to be played." into froyo 2010-05-05 12:02:18 -07:00
James Dong
0835f06799 Merge "Support audio and video track interleaving in the recorded mp4 file" into kraken 2010-05-05 11:40:51 -07:00
James Dong
3300e9667e Support audio and video track interleaving in the recorded mp4 file
Change-Id: Ifa27eb23ee265f84fe06773b29b0eb2b0b075b60
2010-05-05 11:34:43 -07:00
Jean-Baptiste Queru
f1fdf3c7e8 Merge "Call register_localized_collators() with the current locale." 2010-05-05 11:16:31 -07:00
Jean-Michel Trivi
13b18fd7f9 Fix bug 2594126 Do not crash when ViewRoot is trying to play a UI
sound.
This CL doesn't fix why mView can be null in the first place, but
prevents a crash when mView is null and a UI sound is to be played.

Change-Id: I74ea03567e8e6ebebb6c95c80a473abf11e1163d
2010-05-05 09:37:41 -07:00
Scott Main
26dfbb6757 am 9aa12f85: am a69e10db: fix doc bug in hello gallery tutorial
Merge commit '9aa12f85bef352bbc528fbee2ccd7350a2f30394' into kraken

* commit '9aa12f85bef352bbc528fbee2ccd7350a2f30394':
  fix doc bug in hello gallery tutorial
2010-05-05 09:29:39 -07:00
Scott Main
9aa12f85be am a69e10db: fix doc bug in hello gallery tutorial
Merge commit 'a69e10db2fb58deb5e27aa67c46d267af928374b' into froyo-plus-aosp

* commit 'a69e10db2fb58deb5e27aa67c46d267af928374b':
  fix doc bug in hello gallery tutorial
2010-05-05 09:27:50 -07:00
Daisuke Miyakawa
5763c1f501 Call register_localized_collators() with the current locale.
Make JNI function for setLocale() call register_localized_collators()
with the current locale, not previous one, every time it is possible.

This is a partial cherry-pick of b945639d0c3fa1850c07a2b80f476c8d242a8bde

BUG: 2514026
Change-Id: I584f1f68814dc084e699714e9d14a034123b49da
2010-05-05 09:01:48 -07:00
Scott Main
a69e10db2f fix doc bug in hello gallery tutorial
Change-Id: I05ff14f7b15a8fd338dec8004912845eebe94347
2010-05-05 08:58:09 -07:00
Dianne Hackborn
c2da11d826 Merge "Set alpha value for newly created dim surface." 2010-05-04 23:58:26 -07:00
Dianne Hackborn
d9d009d721 am 3445dae3: am 65b2561c: Merge "Fix issue #2643754: Launcher is caching widget layouts for too long" into froyo
Merge commit '3445dae3f52fa8421e3b93496ac93c5753a43bd2' into kraken

* commit '3445dae3f52fa8421e3b93496ac93c5753a43bd2':
  Fix issue #2643754: Launcher is caching widget layouts for too long
2010-05-04 18:30:51 -07:00
Bjorn Bringert
b6179a7069 am 0c698e6e: am c9dc1090: Merge "Build searchables list after boot" into froyo
Merge commit '0c698e6e78a897d9ad14d802ccff2f2bda15b14b' into kraken

* commit '0c698e6e78a897d9ad14d802ccff2f2bda15b14b':
  Build searchables list after boot
2010-05-04 18:30:47 -07:00
Dianne Hackborn
3445dae3f5 am 65b2561c: Merge "Fix issue #2643754: Launcher is caching widget layouts for too long" into froyo
Merge commit '65b2561c3bd74b639df0fead2041c775b7f40000' into froyo-plus-aosp

* commit '65b2561c3bd74b639df0fead2041c775b7f40000':
  Fix issue #2643754: Launcher is caching widget layouts for too long
2010-05-04 18:22:39 -07:00
Bjorn Bringert
0c698e6e78 am c9dc1090: Merge "Build searchables list after boot" into froyo
Merge commit 'c9dc10908a683e37c3db23a9eaa74f04071013cf' into froyo-plus-aosp

* commit 'c9dc10908a683e37c3db23a9eaa74f04071013cf':
  Build searchables list after boot
2010-05-04 18:22:36 -07:00
Dianne Hackborn
65b2561c3b Merge "Fix issue #2643754: Launcher is caching widget layouts for too long" into froyo 2010-05-04 17:43:25 -07:00
Dianne Hackborn
4416c3d6e4 Fix issue #2643754: Launcher is caching widget layouts for too long
With the .apk file names now changing during an update, we need
to make sure to flush all caches related to a package when the
package is removed.  Otherwise we can continue to use the old
package, since its old file may still exist if we try to load it
too soon.

Change-Id: I15f08dffca3feac999dbca4f24bef12a30ca0a66
2010-05-04 17:22:49 -07:00