Commit Graph

21499 Commits

Author SHA1 Message Date
Dan Egnor
ca48c88c3d am 8a8658a5: Merge "Make static versions of libutils and libbinder." into froyo
Merge commit '8a8658a5de261c2da72d431940877bd054bc9837' into froyo-plus-aosp

* commit '8a8658a5de261c2da72d431940877bd054bc9837':
  Make static versions of libutils and libbinder.
2010-05-06 17:33:45 -07:00
Dan Egnor
8a8658a5de Merge "Make static versions of libutils and libbinder." into froyo 2010-05-06 17:31:48 -07:00
Daniel Sandler
ad2f9ff786 am 08e1b94c: Merge "Fix "p.m." in lockscreen (locale: es)." into froyo
Merge commit '08e1b94c5c06dc27ad11393bc66c81c2ebc5ad27' into froyo-plus-aosp

* commit '08e1b94c5c06dc27ad11393bc66c81c2ebc5ad27':
  Fix "p.m." in lockscreen (locale: es).
2010-05-06 17:24:22 -07:00
Daniel Sandler
08e1b94c5c Merge "Fix "p.m." in lockscreen (locale: es)." into froyo 2010-05-06 17:23:03 -07:00
Robert Greenwalt
d6d115173a am f9dc24de: Merge "Fix ThrottleService wifi interaction" into froyo
Merge commit 'f9dc24de53890e0a8289a4349562ed4bd9611974' into froyo-plus-aosp

* commit 'f9dc24de53890e0a8289a4349562ed4bd9611974':
  Fix ThrottleService wifi interaction
2010-05-06 17:16:04 -07:00
Robert Greenwalt
f9dc24de53 Merge "Fix ThrottleService wifi interaction" into froyo 2010-05-06 17:14:23 -07:00
Robert Greenwalt
fee4683f47 Fix ThrottleService wifi interaction
When we switch to another network (or even just lose mobile data) the mobile
interface is either brought down or destroyed altogether.  That means any
throttling rules we've told the kernel about get lost.

This change notices when our interface comes up and reinstates throttling
if needed.

bug:2660287
Change-Id: I4c6ebf78acc59ed66b95984a1e8b7c2ffbc22dcb
2010-05-06 16:45:43 -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
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
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
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
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
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
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
f78964490d merge from open-source master
Change-Id: Ia9e1f4e049f5870386ea29ddb6e3ef028ea918da
2010-05-05 15:57:42 -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
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
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
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 b945639d0c

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