OSDN Git Service
Dirk Dougherty [Mon, 10 May 2010 16:49:37 +0000 (09:49 -0700)]
am
e4682e8a: am
fb70ffd9: Merge "Doc change: cherry-pick from master: Testing Android Applications document (concepts)" into froyo
Merge commit '
e4682e8ae75d573c12ddabce13b8b5c39011a86f' into kraken
* commit '
e4682e8ae75d573c12ddabce13b8b5c39011a86f':
Doc change: cherry-pick from master: Testing Android Applications document (concepts)
Scott Main [Mon, 10 May 2010 16:49:34 +0000 (09:49 -0700)]
am
fe5921aa: am
c4c42eef: docs: add default value and compatibility info for installLocation
Merge commit '
fe5921aa7e4ed5a1de02259d4ac468b7b013fa83' into kraken
* commit '
fe5921aa7e4ed5a1de02259d4ac468b7b013fa83':
docs: add default value and compatibility info for installLocation
Scott Main [Mon, 10 May 2010 16:49:30 +0000 (09:49 -0700)]
am
d2f2a80e: am
c6cb8a78: docs: revisions to the new resources doc based on editorial feedback plus some fixes to resource references and other misc revisions
Merge commit '
d2f2a80e9ff7f0b2229d921f24682d984e3b5673' into kraken
* commit '
d2f2a80e9ff7f0b2229d921f24682d984e3b5673':
docs: revisions to the new resources doc based on editorial feedback
Andreas Huber [Mon, 10 May 2010 16:49:24 +0000 (09:49 -0700)]
am
17078510: am
d13efb20: Merge "A new OggExtractor/VorbisDecoder combo to support approximate seeking." into froyo
Merge commit '
1707851090e6512a77247b0c260dd673ef687589' into kraken
* commit '
1707851090e6512a77247b0c260dd673ef687589':
A new OggExtractor/VorbisDecoder combo to support approximate seeking.
Mathias Agopian [Mon, 10 May 2010 16:49:19 +0000 (09:49 -0700)]
am
56aed6bd: am
c69775d6: Merge "fix [
2664345] Flash: Bad flicker at the end of a pinch zoom." into froyo
Merge commit '
56aed6bde0c52658d2cb1207c0cfe8ba0a764c59' into kraken
* commit '
56aed6bde0c52658d2cb1207c0cfe8ba0a764c59':
fix [
2664345] Flash: Bad flicker at the end of a pinch zoom.
Dirk Dougherty [Mon, 10 May 2010 16:49:13 +0000 (09:49 -0700)]
am
aff856d0: am
0dd3a239: Merge "Doc change: cherry-pick from master: Activity Testing/Hello, Testing tutorials doc files" into froyo
Merge commit '
aff856d053ba239114e7f16d3cdd240a6d973f2f' into kraken
* commit '
aff856d053ba239114e7f16d3cdd240a6d973f2f':
Doc change: cherry-pick from master: Activity Testing/Hello, Testing tutorials doc files
Dirk Dougherty [Mon, 10 May 2010 16:43:50 +0000 (09:43 -0700)]
am
fb70ffd9: Merge "Doc change: cherry-pick from master: Testing Android Applications document (concepts)" into froyo
Merge commit '
fb70ffd993a9ec60c806b873014b2f0f6e874c77' into froyo-plus-aosp
* commit '
fb70ffd993a9ec60c806b873014b2f0f6e874c77':
Doc change: cherry-pick from master: Testing Android Applications document (concepts)
Scott Main [Mon, 10 May 2010 16:43:47 +0000 (09:43 -0700)]
am
c4c42eef: docs: add default value and compatibility info for installLocation
Merge commit '
c4c42eef9a62846a152094d61987e6dd2728e417' into froyo-plus-aosp
* commit '
c4c42eef9a62846a152094d61987e6dd2728e417':
docs: add default value and compatibility info for installLocation
Scott Main [Mon, 10 May 2010 16:43:35 +0000 (09:43 -0700)]
am
c6cb8a78: docs: revisions to the new resources doc based on editorial feedback plus some fixes to resource references and other misc revisions
Merge commit '
c6cb8a78d03cda44a49a990b4d4153560bee7420' into froyo-plus-aosp
* commit '
c6cb8a78d03cda44a49a990b4d4153560bee7420':
docs: revisions to the new resources doc based on editorial feedback
Andreas Huber [Mon, 10 May 2010 16:43:26 +0000 (09:43 -0700)]
am
d13efb20: Merge "A new OggExtractor/VorbisDecoder combo to support approximate seeking." into froyo
Merge commit '
d13efb20089e44e6958cb9704864c03821f19e1c' into froyo-plus-aosp
* commit '
d13efb20089e44e6958cb9704864c03821f19e1c':
A new OggExtractor/VorbisDecoder combo to support approximate seeking.
Mathias Agopian [Mon, 10 May 2010 16:43:23 +0000 (09:43 -0700)]
am
c69775d6: Merge "fix [
2664345] Flash: Bad flicker at the end of a pinch zoom." into froyo
Merge commit '
c69775d616c25d31dcea119ab1e7af19148853e2' into froyo-plus-aosp
* commit '
c69775d616c25d31dcea119ab1e7af19148853e2':
fix [
2664345] Flash: Bad flicker at the end of a pinch zoom.
Dirk Dougherty [Mon, 10 May 2010 16:43:03 +0000 (09:43 -0700)]
am
0dd3a239: Merge "Doc change: cherry-pick from master: Activity Testing/Hello, Testing tutorials doc files" into froyo
Merge commit '
0dd3a239519369933d4efa701479c816b4b33874' into froyo-plus-aosp
* commit '
0dd3a239519369933d4efa701479c816b4b33874':
Doc change: cherry-pick from master: Activity Testing/Hello, Testing tutorials doc files
Chih-Chung Chang [Mon, 10 May 2010 07:04:40 +0000 (15:04 +0800)]
Force sooner/generic/sim to use camera stub only.
Change-Id: Ie3251e3801cd09b3f373bbd4afb5fda82a0c5818
Chih-Chung Chang [Mon, 10 May 2010 06:36:24 +0000 (14:36 +0800)]
Fix for build without a hardware camera.
Change-Id: Ib5a0b58ea9e02ae1df9d258de541726189147567
Chih-Chung Chang [Thu, 6 May 2010 08:36:58 +0000 (16:36 +0800)]
Support multiple cameras in framework.
Change-Id: I081f0fbdca4b633715ea7c3b3d42f8662d27598a
Dirk Dougherty [Sat, 8 May 2010 04:07:57 +0000 (21:07 -0700)]
Merge "Doc change: cherry-pick from master: Testing Android Applications document (concepts)" into froyo
Andreas Huber [Fri, 7 May 2010 20:47:42 +0000 (13:47 -0700)]
Merge "A new OggExtractor/VorbisDecoder combo to support approximate seeking." into froyo
Mathias Agopian [Fri, 7 May 2010 20:39:29 +0000 (13:39 -0700)]
Merge "fix [
2664345] Flash: Bad flicker at the end of a pinch zoom." into froyo
Dirk Dougherty [Fri, 7 May 2010 17:57:48 +0000 (10:57 -0700)]
Merge "Doc change: cherry-pick from master: Activity Testing/Hello, Testing tutorials doc files" into froyo
Brian Carlstrom [Fri, 7 May 2010 17:25:41 +0000 (10:25 -0700)]
am
e34d31e6: am
e616553e: Updaing preloaded classes with removal of OpenSSLSocketImpl
Merge commit '
e34d31e690cdfc529fe8e1e8f70e50c3719a4ccc' into kraken
* commit '
e34d31e690cdfc529fe8e1e8f70e50c3719a4ccc':
Updaing preloaded classes with removal of OpenSSLSocketImpl$Finalizer
Brian Carlstrom [Fri, 7 May 2010 17:23:34 +0000 (10:23 -0700)]
am
e616553e: Updaing preloaded classes with removal of OpenSSLSocketImpl
Merge commit '
e616553ebc895bef22b7e9e1d1d4b6cffdbe82fe' into froyo-plus-aosp
* commit '
e616553ebc895bef22b7e9e1d1d4b6cffdbe82fe':
Updaing preloaded classes with removal of OpenSSLSocketImpl$Finalizer
Joe Malin [Fri, 7 May 2010 15:58:42 +0000 (08:58 -0700)]
am
9609cdc8: am
e50b940f: Doc Change: cherry-pick doc change from -> Add images for the index file for the SpinnerTest test application sample.
Merge commit '
9609cdc8522414b61ffb7d31b4ceb2007f205129' into kraken
* commit '
9609cdc8522414b61ffb7d31b4ceb2007f205129':
Doc Change: cherry-pick doc change from master. -> Add images for the index file for the SpinnerTest test application sample.
Joe Malin [Fri, 7 May 2010 15:54:53 +0000 (08:54 -0700)]
am
e50b940f: Doc Change: cherry-pick doc change from -> Add images for the index file for the SpinnerTest test application sample.
Merge commit '
e50b940f153070a631a6c0d426cb7f3207042659' into froyo-plus-aosp
* commit '
e50b940f153070a631a6c0d426cb7f3207042659':
Doc Change: cherry-pick doc change from master. -> Add images for the index file for the SpinnerTest test application sample.
Bjorn Bringert [Fri, 7 May 2010 10:43:48 +0000 (03:43 -0700)]
am
c8170ee2: am
75370e74: Merge "Fixing: RecognitionService logcat spam "cancel called..."" into froyo
Merge commit '
c8170ee2055dcaf993391aacef0e54d87561bfdb' into kraken
* commit '
c8170ee2055dcaf993391aacef0e54d87561bfdb':
Fixing: RecognitionService logcat spam "cancel called..."
Bjorn Bringert [Fri, 7 May 2010 10:40:31 +0000 (03:40 -0700)]
am
75370e74: Merge "Fixing: RecognitionService logcat spam "cancel called..."" into froyo
Merge commit '
75370e74629b4938c4472d6001eebf5e305dbc55' into froyo-plus-aosp
* commit '
75370e74629b4938c4472d6001eebf5e305dbc55':
Fixing: RecognitionService logcat spam "cancel called..."
Bjorn Bringert [Fri, 7 May 2010 10:37:48 +0000 (03:37 -0700)]
Merge "Fixing: RecognitionService logcat spam "cancel called..."" into froyo
Mathias Agopian [Fri, 7 May 2010 03:21:45 +0000 (20:21 -0700)]
fix [
2664345] Flash: Bad flicker at the end of a pinch zoom.
the window manger puts SurfaceViews up before they have been
rendered into, because of that surfaceflinger doesn't have
anything ready to draw for that surface when an udpate occurs
and responds by filling the surface with black.
With this fix, we only fill those areas of the framebuffer
that would otherwise be undefined (no content at all).
in the Flash case, the "flash" window is not drawn at all
until it has some content, instead the underlaying browser
window is shown.
Change-Id: Ifb610f7f8c27b88edf83e09adc4803fc295c15a1
Dan Egnor [Fri, 7 May 2010 00:35:06 +0000 (17:35 -0700)]
am
ca48c88c: am
8a8658a5: Merge "Make static versions of libutils and libbinder." into froyo
Merge commit '
ca48c88c3d5733c4405a2fc4f7d9bb7fbba3d43f' into kraken
* commit '
ca48c88c3d5733c4405a2fc4f7d9bb7fbba3d43f':
Make static versions of libutils and libbinder.
Dan Egnor [Fri, 7 May 2010 00:33:45 +0000 (17:33 -0700)]
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.
Dan Egnor [Fri, 7 May 2010 00:31:48 +0000 (17:31 -0700)]
Merge "Make static versions of libutils and libbinder." into froyo
Daniel Sandler [Fri, 7 May 2010 00:29:53 +0000 (17:29 -0700)]
am
ad2f9ff7: (-s ours) am
08e1b94c: Merge "Fix "p.m." in lockscreen (locale: es)." into froyo
Merge commit '
ad2f9ff786d83851c5aaccf0e8d49f50e58fb7dd' into kraken
* commit '
ad2f9ff786d83851c5aaccf0e8d49f50e58fb7dd':
Fix "p.m." in lockscreen (locale: es).
Daniel Sandler [Fri, 7 May 2010 00:24:22 +0000 (17:24 -0700)]
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).
Daniel Sandler [Fri, 7 May 2010 00:23:03 +0000 (17:23 -0700)]
Merge "Fix "p.m." in lockscreen (locale: es)." into froyo
Robert Greenwalt [Fri, 7 May 2010 00:17:51 +0000 (17:17 -0700)]
am
d6d11517: am
f9dc24de: Merge "Fix ThrottleService wifi interaction" into froyo
Merge commit '
d6d115173a856fe28cf5a3087f6d7b0de77495c5' into kraken
* commit '
d6d115173a856fe28cf5a3087f6d7b0de77495c5':
Fix ThrottleService wifi interaction
Robert Greenwalt [Fri, 7 May 2010 00:16:04 +0000 (17:16 -0700)]
am
f9dc24de: Merge "Fix ThrottleService wifi interaction" into froyo
Merge commit '
f9dc24de53890e0a8289a4349562ed4bd9611974' into froyo-plus-aosp
* commit '
f9dc24de53890e0a8289a4349562ed4bd9611974':
Fix ThrottleService wifi interaction
Robert Greenwalt [Fri, 7 May 2010 00:14:23 +0000 (17:14 -0700)]
Merge "Fix ThrottleService wifi interaction" into froyo
Kenny Root [Fri, 7 May 2010 00:12:13 +0000 (17:12 -0700)]
Merge "Prevent local reference table overflows" into kraken
Jim Miller [Thu, 6 May 2010 23:36:23 +0000 (16:36 -0700)]
Merge "Manual integration of I32a7b5 from froyo" into kraken
Xia Wang [Thu, 6 May 2010 23:31:36 +0000 (16:31 -0700)]
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.
Dan Morrill [Thu, 6 May 2010 23:31:31 +0000 (16:31 -0700)]
am
60b02cab: am
61993757: Merge "Adding PacketVideo attribution in NOTICE." into froyo
Merge commit '
60b02cab9cba74e4fe1fcbe64af85ed867d20cf9' into kraken
* commit '
60b02cab9cba74e4fe1fcbe64af85ed867d20cf9':
Adding PacketVideo attribution in NOTICE.
Neal Nguyen [Thu, 6 May 2010 23:31:27 +0000 (16:31 -0700)]
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.
Xia Wang [Thu, 6 May 2010 23:12:38 +0000 (16:12 -0700)]
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.
Dan Morrill [Thu, 6 May 2010 23:12:33 +0000 (16:12 -0700)]
am
61993757: Merge "Adding PacketVideo attribution in NOTICE." into froyo
Merge commit '
6199375773a8b3c8eebec17ffc1bce2ee7169d57' into froyo-plus-aosp
* commit '
6199375773a8b3c8eebec17ffc1bce2ee7169d57':
Adding PacketVideo attribution in NOTICE.
Neal Nguyen [Thu, 6 May 2010 23:12:22 +0000 (16:12 -0700)]
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.
Xia Wang [Thu, 6 May 2010 22:24:08 +0000 (15:24 -0700)]
Merge "Avoid UNKNOWN state for Wifi in bug2542613, not a common user case." into froyo
The Android Open Source Project [Thu, 6 May 2010 22:22:17 +0000 (15:22 -0700)]
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.
The Android Open Source Project [Thu, 6 May 2010 22:18:59 +0000 (15:18 -0700)]
merge from open-source master
Change-Id: I4c28751bd84b41259b12b0f3e3307e11234c8b64
Dan Morrill [Thu, 6 May 2010 22:11:02 +0000 (15:11 -0700)]
Merge "Adding PacketVideo attribution in NOTICE." into froyo
Dan Morrill [Thu, 6 May 2010 21:15:47 +0000 (14:15 -0700)]
Adding PacketVideo attribution in NOTICE.
Change-Id: Id2fe398d4deed6ebd8cba8516ffc6c0334a961b0
Neal Nguyen [Thu, 6 May 2010 20:45:18 +0000 (13:45 -0700)]
Merge "Propagating IOException from RemoteAndroidTestRunner#run() in PackageManagerHostTestUtils." into froyo
Andreas Huber [Thu, 6 May 2010 19:43:59 +0000 (12:43 -0700)]
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.
Dirk Dougherty [Thu, 6 May 2010 19:43:56 +0000 (12:43 -0700)]
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
Dan Bornstein [Thu, 6 May 2010 19:43:52 +0000 (12:43 -0700)]
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.
Neal Nguyen [Thu, 6 May 2010 19:43:48 +0000 (12:43 -0700)]
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.
Andreas Huber [Thu, 6 May 2010 19:36:13 +0000 (12:36 -0700)]
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.
Dirk Dougherty [Thu, 6 May 2010 19:36:10 +0000 (12:36 -0700)]
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
Dan Bornstein [Thu, 6 May 2010 19:36:05 +0000 (12:36 -0700)]
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.
Neal Nguyen [Thu, 6 May 2010 19:36:01 +0000 (12:36 -0700)]
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.
Andreas Huber [Thu, 6 May 2010 18:27:35 +0000 (11:27 -0700)]
Merge "Disable vorbis seek when streaming from localhost." into froyo
Dan Bornstein [Thu, 6 May 2010 17:01:39 +0000 (10:01 -0700)]
Merge "For issue #
2651381, allow library prelinking." into froyo
Neal Nguyen [Thu, 6 May 2010 16:44:10 +0000 (09:44 -0700)]
Merge "Adding a few host-based stress tests for Apps on SD." into froyo
Mike Lockwood [Thu, 6 May 2010 14:50:13 +0000 (07:50 -0700)]
Merge "GpsLocationProvider: Store new Location before onGpsStatusChanged is sent"
Dan Egnor [Thu, 6 May 2010 07:55:09 +0000 (00:55 -0700)]
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
Suchi Amalapurapu [Thu, 6 May 2010 00:52:25 +0000 (17:52 -0700)]
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.
Dan Bornstein [Thu, 6 May 2010 00:52:22 +0000 (17:52 -0700)]
am
2a1674b1: am
2d315667: For issue #
2651381, allow library prelinking.
Merge commit '
2a1674b1d00fda68980ec834d6ce61aacd379bc8' into kraken
* commit '
2a1674b1d00fda68980ec834d6ce61aacd379bc8':
For issue #
2651381, allow library prelinking.
Suchi Amalapurapu [Thu, 6 May 2010 00:50:34 +0000 (17:50 -0700)]
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.
Dan Bornstein [Thu, 6 May 2010 00:50:28 +0000 (17:50 -0700)]
am
2d315667: For issue #
2651381, allow library prelinking.
Merge commit '
2d315667ab733375d8c696f8c2f155bc1de9e4a2' into froyo-plus-aosp
* commit '
2d315667ab733375d8c696f8c2f155bc1de9e4a2':
For issue #
2651381, allow library prelinking.
Suchi Amalapurapu [Thu, 6 May 2010 00:38:58 +0000 (17:38 -0700)]
Merge "Fix
2656989. Clean up update to updated system applications." into froyo
Jean-Baptiste Queru [Wed, 5 May 2010 23:30:53 +0000 (16:30 -0700)]
Merge "Telephony: Add PUK MMI code support for CDMA RUIM phones"
Jean-Baptiste Queru [Wed, 5 May 2010 23:18:30 +0000 (16:18 -0700)]
Merge "Type Zero Sms should not be displayed/stored/notified."
The Android Open Source Project [Wed, 5 May 2010 23:00:01 +0000 (16:00 -0700)]
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
The Android Open Source Project [Wed, 5 May 2010 22:57:42 +0000 (15:57 -0700)]
merge from open-source master
Change-Id: Ia9e1f4e049f5870386ea29ddb6e3ef028ea918da
Jaikumar Ganesh [Wed, 5 May 2010 22:25:54 +0000 (15:25 -0700)]
Merge "Add UUID property for adapter." into kraken
Dianne Hackborn [Wed, 5 May 2010 22:18:59 +0000 (15:18 -0700)]
Merge "First pass at NativeActivity." into kraken
Jean-Baptiste Queru [Wed, 5 May 2010 20:49:58 +0000 (13:49 -0700)]
Merge "Add new keycodes for the convenience of Japanese IMEs"
mogimo [Fri, 2 Oct 2009 18:13:56 +0000 (03:13 +0900)]
Add new keycodes for the convenience of Japanese IMEs
Change-Id: Ibd308cef11261147856258595f6ca0137e03e05c
Jean-Baptiste Queru [Wed, 5 May 2010 20:15:24 +0000 (13:15 -0700)]
Merge "telephony: Fix CID when CID is unknown"
Jean-Michel Trivi [Wed, 5 May 2010 19:06:12 +0000 (12:06 -0700)]
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
Jean-Michel Trivi [Wed, 5 May 2010 19:03:43 +0000 (12:03 -0700)]
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
Jean-Michel Trivi [Wed, 5 May 2010 19:02:18 +0000 (12:02 -0700)]
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
James Dong [Wed, 5 May 2010 18:40:51 +0000 (11:40 -0700)]
Merge "Support audio and video track interleaving in the recorded mp4 file" into kraken
Jean-Baptiste Queru [Wed, 5 May 2010 18:16:31 +0000 (11:16 -0700)]
Merge "Call register_localized_collators() with the current locale."
Scott Main [Wed, 5 May 2010 16:29:39 +0000 (09:29 -0700)]
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
Scott Main [Wed, 5 May 2010 16:27:50 +0000 (09:27 -0700)]
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
Dianne Hackborn [Wed, 5 May 2010 06:58:26 +0000 (23:58 -0700)]
Merge "Set alpha value for newly created dim surface."
Dianne Hackborn [Wed, 5 May 2010 01:30:51 +0000 (18:30 -0700)]
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
Bjorn Bringert [Wed, 5 May 2010 01:30:47 +0000 (18:30 -0700)]
am
0c698e6e: am
c9dc1090: Merge "Build searchables list after boot" into froyo
Merge commit '
0c698e6e78a897d9ad14d802ccff2f2bda15b14b' into kraken
* commit '
0c698e6e78a897d9ad14d802ccff2f2bda15b14b':
Build searchables list after boot
Dianne Hackborn [Wed, 5 May 2010 01:22:39 +0000 (18:22 -0700)]
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
Bjorn Bringert [Wed, 5 May 2010 01:22:36 +0000 (18:22 -0700)]
am
c9dc1090: Merge "Build searchables list after boot" into froyo
Merge commit '
c9dc10908a683e37c3db23a9eaa74f04071013cf' into froyo-plus-aosp
* commit '
c9dc10908a683e37c3db23a9eaa74f04071013cf':
Build searchables list after boot
Dianne Hackborn [Wed, 5 May 2010 00:43:25 +0000 (17:43 -0700)]
Merge "Fix issue #
2643754: Launcher is caching widget layouts for too long" into froyo
Bjorn Bringert [Tue, 4 May 2010 23:57:56 +0000 (16:57 -0700)]
Merge "Build searchables list after boot" into froyo
Scott Main [Tue, 4 May 2010 23:06:57 +0000 (16:06 -0700)]
am
0915d0aa: am
5e5202bd: Merge "docs: resolve doc bug bug:
2648699" into froyo
Merge commit '
0915d0aa9c13b365d48c6868ac47913ecd172d07' into kraken
* commit '
0915d0aa9c13b365d48c6868ac47913ecd172d07':
docs: resolve doc bug
Scott Main [Tue, 4 May 2010 23:04:46 +0000 (16:04 -0700)]
am
5e5202bd: Merge "docs: resolve doc bug bug:
2648699" into froyo
Merge commit '
5e5202bd6f9e7687fc6399762529b0ef5625e515' into froyo-plus-aosp
* commit '
5e5202bd6f9e7687fc6399762529b0ef5625e515':
docs: resolve doc bug
Scott Main [Tue, 4 May 2010 23:03:37 +0000 (16:03 -0700)]
Merge "docs: resolve doc bug bug:
2648699" into froyo
Jaikumar Ganesh [Tue, 4 May 2010 22:53:31 +0000 (15:53 -0700)]
Merge "Revert "Fix runtime reboot when connecting to a A2DP headset and"" into kraken
Adam Powell [Tue, 4 May 2010 22:41:41 +0000 (15:41 -0700)]
am
d135f74b: am
151af19b: Fix bug
2651076 - Catch/log ActivityNotFoundException in MenuItemImpl.invoke()
Merge commit '
d135f74b972b88de2ae8b11b3ada886d29c1e25d' into kraken
* commit '
d135f74b972b88de2ae8b11b3ada886d29c1e25d':
Fix bug
2651076 - Catch/log ActivityNotFoundException in MenuItemImpl.invoke()
Adam Powell [Tue, 4 May 2010 22:40:36 +0000 (15:40 -0700)]
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()
Jean-Baptiste Queru [Tue, 4 May 2010 22:16:32 +0000 (15:16 -0700)]
Merge "Fix for bug
2467152 files with spaces fail to open."
James Dong [Tue, 4 May 2010 21:40:28 +0000 (14:40 -0700)]
Merge "Support AAC recording" into kraken
Andreas Huber [Tue, 4 May 2010 21:30:34 +0000 (14:30 -0700)]
am
8ea45aad: am
e083d0a2: Merge "Support for Ogg Vorbis decoding in stagefright." into froyo
Merge commit '
8ea45aad100ee25067b2e83703454c71a968ba4f' into kraken
* commit '
8ea45aad100ee25067b2e83703454c71a968ba4f':
Support for Ogg Vorbis decoding in stagefright.
OSDN Git Service
