22915 Commits

Author SHA1 Message Date
Jim Miller
faa1461df7 am ab4f3c60: Merge "Manual integration of I32a7b5 from froyo" into kraken 2010-05-06 16:37:17 -07:00
Jim Miller
ab4f3c60da Merge "Manual integration of I32a7b5 from froyo" into kraken 2010-05-06 16:36:23 -07:00
Kenny Root
485dd21bbe Prevent local reference table overflows
If we're grabbing references to many strings in a loop, we have to
remove our local references so we don't overflow the VM's local
reference table.

Also, use env->ExceptionCheck() instead of checking for NULL value
returns on trying to allocate new items.

Bug: 2663816
Change-Id: I9cb5e17f6181dbb2f2c03d53841b2f5d8ab10f68
2010-05-06 16:35:21 -07:00
Xia Wang
4b86be10cc am 0bfc3973: am 3e6c1696: am 11505b47: Merge "Avoid UNKNOWN state for Wifi in bug2542613, not a common user case." into froyo 2010-05-06 16:35:06 -07:00
Dan Morrill
a371dfc5ba am 9fd3a6be: am 60b02cab: am 61993757: Merge "Adding PacketVideo attribution in NOTICE." into froyo 2010-05-06 16:35:01 -07:00
Neal Nguyen
529ad92e89 am bda001aa: am ad0830a1: am 639a7fc2: Merge "Propagating IOException from RemoteAndroidTestRunner#run() in PackageManagerHostTestUtils." into froyo 2010-05-06 16:34:57 -07:00
Xia Wang
0bfc397376 am 3e6c1696: am 11505b47: Merge "Avoid UNKNOWN state for Wifi in bug2542613, not a common user case." into froyo
Merge commit '3e6c1696135f267cc59d050747839c56ce868ef9' into kraken

* commit '3e6c1696135f267cc59d050747839c56ce868ef9':
  Avoid UNKNOWN state for Wifi in bug2542613, not a common user case.
2010-05-06 16:31:36 -07:00
Jim Miller
1d587e3d5d Manual integration of I32a7b5 from froyo
Fix 2662816: Move UI update from async callback to ui thread.

This fixes a bug where the view hierarchy in AccountUnlockScreen was being
modified by the async callback thread from AccountManager.

Change-Id: I5f1b4e04a7e4af68a5705545765f294cdbd0f17b
2010-05-06 16:31:34 -07:00
Dan Morrill
9fd3a6beb5 am 60b02cab: am 61993757: Merge "Adding PacketVideo attribution in NOTICE." into froyo
Merge commit '60b02cab9cba74e4fe1fcbe64af85ed867d20cf9' into kraken

* commit '60b02cab9cba74e4fe1fcbe64af85ed867d20cf9':
  Adding PacketVideo attribution in NOTICE.
2010-05-06 16:31:31 -07:00
Neal Nguyen
bda001aa32 am ad0830a1: am 639a7fc2: Merge "Propagating IOException from RemoteAndroidTestRunner#run() in PackageManagerHostTestUtils." into froyo
Merge commit 'ad0830a136e1a205be42f18c4b779e50c9ac1985' into kraken

* commit 'ad0830a136e1a205be42f18c4b779e50c9ac1985':
  Propagating IOException from RemoteAndroidTestRunner#run() in PackageManagerHostTestUtils.
2010-05-06 16:31:27 -07:00
Xia Wang
3e6c169613 am 11505b47: Merge "Avoid UNKNOWN state for Wifi in bug2542613, not a common user case." into froyo
Merge commit '11505b474b16457fb65952aadba0609cb33de8e7' into froyo-plus-aosp

* commit '11505b474b16457fb65952aadba0609cb33de8e7':
  Avoid UNKNOWN state for Wifi in bug2542613, not a common user case.
2010-05-06 16:12:38 -07:00
Dan Morrill
60b02cab9c am 61993757: Merge "Adding PacketVideo attribution in NOTICE." into froyo
Merge commit '6199375773a8b3c8eebec17ffc1bce2ee7169d57' into froyo-plus-aosp

* commit '6199375773a8b3c8eebec17ffc1bce2ee7169d57':
  Adding PacketVideo attribution in NOTICE.
2010-05-06 16:12:33 -07:00
Neal Nguyen
ad0830a136 am 639a7fc2: Merge "Propagating IOException from RemoteAndroidTestRunner#run() in PackageManagerHostTestUtils." into froyo
Merge commit '639a7fc2c2d0bda12fef0c822bb2e3c002d5c5b4' into froyo-plus-aosp

* commit '639a7fc2c2d0bda12fef0c822bb2e3c002d5c5b4':
  Propagating IOException from RemoteAndroidTestRunner#run() in PackageManagerHostTestUtils.
2010-05-06 16:12:22 -07:00
The Android Open Source Project
e107c141a9 am 9d164dc5: am f4dffd8a: merge from open-source master 2010-05-06 15:32:57 -07:00
Xia Wang
11505b474b Merge "Avoid UNKNOWN state for Wifi in bug2542613, not a common user case." into froyo 2010-05-06 15:24:08 -07:00
The Android Open Source Project
9d164dc5c1 am f4dffd8a: merge from open-source master
Merge commit 'f4dffd8a45386b5a5f0e6de4f30facc9eaac4001' into kraken

* commit 'f4dffd8a45386b5a5f0e6de4f30facc9eaac4001':
  GpsLocationProvider: Store new Location before onGpsStatusChanged is sent
  Telephony: Add PUK MMI code support for CDMA RUIM phones
  Type Zero Sms should not be displayed/stored/notified.
2010-05-06 15:22:17 -07:00
The Android Open Source Project
f4dffd8a45 merge from open-source master
Change-Id: I4c28751bd84b41259b12b0f3e3307e11234c8b64
2010-05-06 15:18:59 -07:00
Dan Morrill
6199375773 Merge "Adding PacketVideo attribution in NOTICE." into froyo 2010-05-06 15:11:02 -07:00
Xia Wang
4672203ea1 Avoid UNKNOWN state for Wifi in bug2542613, not a common user case.
Change-Id: Ief0a953e2909cb5c808f0d683ab95d14f6c53e72
2010-05-06 14:58:40 -07:00
James Dong
2a4767e2fa Metadata construction optimization
- Potentially much shorter stts box if samples have roughly the same duration
- Potentially much shorter stsz box if all samples have the same size

Change-Id: I4f7663dd64285070995585a02bb3ba1e1049a0cf
2010-05-06 14:55:33 -07:00
Dan Morrill
b543297f9d Adding PacketVideo attribution in NOTICE.
Change-Id: Id2fe398d4deed6ebd8cba8516ffc6c0334a961b0
2010-05-06 14:15:47 -07:00
Neal Nguyen
639a7fc2c2 Merge "Propagating IOException from RemoteAndroidTestRunner#run() in PackageManagerHostTestUtils." into froyo 2010-05-06 13:45:18 -07:00
Neal Nguyen
42c2baeb48 Propagating IOException from RemoteAndroidTestRunner#run() in PackageManagerHostTestUtils.
Change-Id: Ia50d58760b4cc1e222927be054c52cc3b2993395
2010-05-06 13:26:58 -07:00
Daniel Sandler
77491f01a3 Fix "p.m." in lockscreen (locale: es).
Use padding instead of margin in DigitalClock's
RelativeLayout params to ensure @id/am_pm's descenders
aren't clipped.

Bug: 2277477
Change-Id: I9c8ef0c60e8ac0d2f969de97e8bfe146553ac379
2010-05-06 16:15:49 -04:00
Andreas Huber
54928ce45a am 8a1c0934: am 71bd9fc8: am 100ef9be: Merge "Disable vorbis seek when streaming from localhost." into froyo 2010-05-06 12:46:39 -07:00
Dirk Dougherty
780f33de1c am 799bc84d: am 8b6ac78e: am 5305627d: Doc change: New doc that describes how market filters work 2010-05-06 12:46:35 -07:00
Dan Bornstein
ebbebf8f74 am ea5477c8: am 89ad07b0: am 42ee86e6: Merge "For issue #2651381, allow library prelinking." into froyo 2010-05-06 12:46:31 -07:00
Neal Nguyen
657757fd26 am 73bbcc4d: am e96e2358: am f541c62b: Merge "Adding a few host-based stress tests for Apps on SD." into froyo 2010-05-06 12:46:27 -07:00
Andreas Huber
8a1c0934b0 am 71bd9fc8: am 100ef9be: Merge "Disable vorbis seek when streaming from localhost." into froyo
Merge commit '71bd9fc81e3154b9cad22ca7ff2d9c6ed6fdbe6c' into kraken

* commit '71bd9fc81e3154b9cad22ca7ff2d9c6ed6fdbe6c':
  Disable vorbis seek when streaming from localhost.
2010-05-06 12:43:59 -07:00
Dirk Dougherty
799bc84d88 am 8b6ac78e: am 5305627d: Doc change: New doc that describes how market filters work
Merge commit '8b6ac78e7476251c8fc38c29a2b95f2dadfdbacc' into kraken

* commit '8b6ac78e7476251c8fc38c29a2b95f2dadfdbacc':
  Doc change: New doc that describes how market filters work
2010-05-06 12:43:56 -07:00
Dan Bornstein
ea5477c854 am 89ad07b0: am 42ee86e6: Merge "For issue #2651381, allow library prelinking." into froyo
Merge commit '89ad07b048ff035394596d6a8916f639f3f0b868' into kraken

* commit '89ad07b048ff035394596d6a8916f639f3f0b868':
  For issue #2651381, allow library prelinking.
2010-05-06 12:43:52 -07:00
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
4ace6122e9 am 9c08d5c5: am 9dfc6971: am df7ccbc8: Merge "Fix 2656989. Clean up update to updated system applications." into froyo 2010-05-05 17:54:53 -07:00
Dan Bornstein
8391a3f410 am ebd2890b: am 2a1674b1: am 2d315667: For issue #2651381, allow library prelinking. 2010-05-05 17:54:49 -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