Robert Greenwalt
66686441cd
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
3bc8dc86a1
Merge "Fix ThrottleService wifi interaction" into froyo
2010-05-06 17:14:23 -07:00
Xia Wang
363809c71d
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
126a6eab49
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
649f6f64b4
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
a62ab7c22a
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
3877d301aa
merge from open-source master
...
Change-Id: I4c28751bd84b41259b12b0f3e3307e11234c8b64
2010-05-06 15:18:59 -07:00
Dan Morrill
2e55d964ca
Merge "Adding PacketVideo attribution in NOTICE." into froyo
2010-05-06 15:11:02 -07:00
Dan Morrill
869aba8aaf
Adding PacketVideo attribution in NOTICE.
...
Change-Id: Id2fe398d4deed6ebd8cba8516ffc6c0334a961b0
2010-05-06 14:15:47 -07:00
Neal Nguyen
ad8507cfdc
Merge "Propagating IOException from RemoteAndroidTestRunner#run() in PackageManagerHostTestUtils." into froyo
2010-05-06 13:45:18 -07:00
Andreas Huber
aeb4f0751f
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
b9575af85c
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
afa867debe
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
7cc7372cb9
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
2da054cbe4
Merge "Disable vorbis seek when streaming from localhost." into froyo
2010-05-06 11:27:35 -07:00
Dan Bornstein
64e6c7296e
Merge "For issue #2651381 , allow library prelinking." into froyo
2010-05-06 10:01:39 -07:00
Neal Nguyen
5c9d242fe4
Merge "Adding a few host-based stress tests for Apps on SD." into froyo
2010-05-06 09:44:10 -07:00
Mike Lockwood
06979ad3df
Merge "GpsLocationProvider: Store new Location before onGpsStatusChanged is sent"
2010-05-06 07:50:13 -07:00
Dan Egnor
386a332b4f
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
Suchi Amalapurapu
5b1932c2ce
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
09667f43c1
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
110ecf0542
Merge "Fix 2656989. Clean up update to updated system applications." into froyo
2010-05-05 17:38:58 -07:00
Jean-Baptiste Queru
afeaca2513
Merge "Telephony: Add PUK MMI code support for CDMA RUIM phones"
2010-05-05 16:30:53 -07:00
Jean-Baptiste Queru
d40eb168d1
Merge "Type Zero Sms should not be displayed/stored/notified."
2010-05-05 16:18:30 -07:00
The Android Open Source Project
30f71ce597
merge from open-source master
...
Change-Id: Ia9e1f4e049f5870386ea29ddb6e3ef028ea918da
2010-05-05 15:57:42 -07:00
Jean-Baptiste Queru
031dd9e254
Merge "Add new keycodes for the convenience of Japanese IMEs"
2010-05-05 13:49:58 -07:00
mogimo
ef1c5c314b
Add new keycodes for the convenience of Japanese IMEs
...
Change-Id: Ibd308cef11261147856258595f6ca0137e03e05c
2010-05-05 13:37:21 -07:00
Jean-Baptiste Queru
873a3772a7
Merge "telephony: Fix CID when CID is unknown"
2010-05-05 13:15:24 -07:00
Jean-Michel Trivi
96bbb9e978
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
e4e1811a2e
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
26b8da8361
Merge "Call register_localized_collators() with the current locale."
2010-05-05 11:16:31 -07:00
Scott Main
3e56175a45
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
Dianne Hackborn
3ac792b4c3
Merge "Set alpha value for newly created dim surface."
2010-05-04 23:58:26 -07:00
Dianne Hackborn
ec2d0323cf
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
930ee51fae
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
25932b1088
Merge "Fix issue #2643754 : Launcher is caching widget layouts for too long" into froyo
2010-05-04 17:43:25 -07:00
Bjorn Bringert
f442576ecf
Merge "Build searchables list after boot" into froyo
2010-05-04 16:57:56 -07:00
Scott Main
c224e59822
am 5e5202bd: Merge "docs: resolve doc bug bug:2648699" into froyo
...
Merge commit '5e5202bd6f9e7687fc6399762529b0ef5625e515' into froyo-plus-aosp
* commit '5e5202bd6f9e7687fc6399762529b0ef5625e515':
docs: resolve doc bug
2010-05-04 16:04:46 -07:00
Scott Main
d11ab7456a
Merge "docs: resolve doc bug bug:2648699" into froyo
2010-05-04 16:03:37 -07:00
Adam Powell
2b349fac4d
am 151af19b: Fix bug 2651076 - Catch/log ActivityNotFoundException in MenuItemImpl.invoke()
...
Merge commit '151af19bf409a47424ddaa51e1ac4a0c532c4eb6' into froyo-plus-aosp
* commit '151af19bf409a47424ddaa51e1ac4a0c532c4eb6':
Fix bug 2651076 - Catch/log ActivityNotFoundException in MenuItemImpl.invoke()
2010-05-04 15:40:36 -07:00
Jean-Baptiste Queru
b7719a307a
Merge "Fix for bug 2467152 files with spaces fail to open."
2010-05-04 15:16:32 -07:00
Andreas Huber
e7f1b6dd9c
am e083d0a2: Merge "Support for Ogg Vorbis decoding in stagefright." into froyo
...
Merge commit 'e083d0a2f50906423ab548047d436c74648fc488' into froyo-plus-aosp
* commit 'e083d0a2f50906423ab548047d436c74648fc488':
Support for Ogg Vorbis decoding in stagefright.
2010-05-04 14:29:04 -07:00
Andreas Huber
fe8bcd9c8a
Merge "Support for Ogg Vorbis decoding in stagefright." into froyo
2010-05-04 14:27:26 -07:00
Scott Main
46016a24eb
am 01451756: Merge "docs: revise and add documentation for backup APIs" into froyo
...
Merge commit '014517569f6378e90cd3b0b5a3f86dfa9b8bf942' into froyo-plus-aosp
* commit '014517569f6378e90cd3b0b5a3f86dfa9b8bf942':
docs: revise and add documentation for backup APIs
2010-05-04 14:21:21 -07:00
Scott Main
69c8c1c8db
Merge "docs: revise and add documentation for backup APIs" into froyo
2010-05-04 14:20:02 -07:00
Daniel Sandler
f27cbc7bed
am 70c6bb0d: Merge "Increase the row height of menus by 1dip." into froyo
...
Merge commit '70c6bb0d3e29368fd4598dd5e1b9b4176c3cd502' into froyo-plus-aosp
* commit '70c6bb0d3e29368fd4598dd5e1b9b4176c3cd502':
Increase the row height of menus by 1dip.
2010-05-04 12:42:48 -07:00
Daniel Sandler
2da986fbd2
Merge "Increase the row height of menus by 1dip." into froyo
2010-05-04 12:40:54 -07:00
Dan Morrill
34910b3d28
am e17b4e71: Merge "Adding the backward-compatible filtering heuristics for the new device features definitions added in FroYo." into froyo
...
Merge commit 'e17b4e711571198f79c0c2bad3656d58c63629e8' into froyo-plus-aosp
* commit 'e17b4e711571198f79c0c2bad3656d58c63629e8':
Adding the backward-compatible filtering heuristics for the new device
2010-05-04 12:38:03 -07:00
Joe Onorato
906a59288c
am f140be6c: Call into app widget hosts when the provider is updated.
...
Merge commit 'f140be6c3c21dd0f6d2214929e89d60de31d2c04' into froyo-plus-aosp
* commit 'f140be6c3c21dd0f6d2214929e89d60de31d2c04':
Call into app widget hosts when the provider is updated.
2010-05-04 12:37:59 -07:00
Dan Morrill
515eb68646
Merge "Adding the backward-compatible filtering heuristics for the new device features definitions added in FroYo." into froyo
2010-05-04 12:03:45 -07:00