git.osdn.net Git - android-x86/frameworks-native.git/log

Swarna Kumar [Tue, 24 Nov 2009 21:37:20 +0000 (13:37 -0800)]

am 20342ca8: am 7f8e3409: Merge change I816428ae into eclair

Merge commit '20342ca83012b442913b409a9218635de9bd6aa6' into eclair-mr2-plus-aosp

* commit '20342ca83012b442913b409a9218635de9bd6aa6':
Temporarily add explicit step to disable keyguard to imf tests to attempt solve test flakiness.

commit | commitdiff | tree

Swarna Kumar [Tue, 24 Nov 2009 21:33:13 +0000 (13:33 -0800)]

am 7f8e3409: Merge change I816428ae into eclair

Merge commit '7f8e34091efdee1a383280b08585f8254472c1fd' into eclair-mr2

* commit '7f8e34091efdee1a383280b08585f8254472c1fd':
Temporarily add explicit step to disable keyguard to imf tests to attempt solve test flakiness.

commit | commitdiff | tree

Android (Google) Code Review [Tue, 24 Nov 2009 21:28:45 +0000 (13:28 -0800)]

Merge change I816428ae into eclair

* changes:
Temporarily add explicit step to disable keyguard to imf tests to attempt solve test flakiness. Bug number : 2177113

commit | commitdiff | tree

Jason Sams [Tue, 24 Nov 2009 20:53:32 +0000 (12:53 -0800)]

am 66358e24: am 9dab667e: Force a crash under conditions where white square bug in all apps is likely to occur.

Merge commit '66358e24a6bbc2017c2edd921a64e616b4c9cac4' into eclair-mr2-plus-aosp

* commit '66358e24a6bbc2017c2edd921a64e616b4c9cac4':
Force a crash under conditions where white square bug in all apps is likely to occur.

commit | commitdiff | tree

Jason Sams [Tue, 24 Nov 2009 20:49:36 +0000 (12:49 -0800)]

am 9dab667e: Force a crash under conditions where white square bug in all apps is likely to occur.

Merge commit '9dab667e03632181e487a04a8a170b3fa0bd5037' into eclair-mr2

* commit '9dab667e03632181e487a04a8a170b3fa0bd5037':
Force a crash under conditions where white square bug in all apps is likely to occur.

commit | commitdiff | tree

Fred Quintana [Tue, 24 Nov 2009 19:03:05 +0000 (11:03 -0800)]

am 2464acc6: moved the gdata library to vendor/google

Merge commit '2464acc6da6393f0163894094468f68b8e496cea' into eclair-mr2-plus-aosp

* commit '2464acc6da6393f0163894094468f68b8e496cea':
moved the gdata library to vendor/google

commit | commitdiff | tree

Trevor Johns [Tue, 24 Nov 2009 17:45:09 +0000 (09:45 -0800)]

am 82d4b5cc: am 99f7b56f: Merge change Iefdb6f97 into eclair

Merge commit '82d4b5ccaf5518ed9286d89e60ac9a595239ac35' into eclair-mr2-plus-aosp

* commit '82d4b5ccaf5518ed9286d89e60ac9a595239ac35':
Fixing minor doc typo in android.widget.SimpleCursorAdapter.

commit | commitdiff | tree

Trevor Johns [Tue, 24 Nov 2009 17:40:19 +0000 (09:40 -0800)]

am 99f7b56f: Merge change Iefdb6f97 into eclair

Merge commit '99f7b56fbea7e3e112fd0b570818b42a8ebd4ef5' into eclair-mr2

* commit '99f7b56fbea7e3e112fd0b570818b42a8ebd4ef5':
Fixing minor doc typo in android.widget.SimpleCursorAdapter.

commit | commitdiff | tree

Android (Google) Code Review [Tue, 24 Nov 2009 17:35:35 +0000 (09:35 -0800)]

Merge change Iefdb6f97 into eclair

* changes:
Fixing minor doc typo in android.widget.SimpleCursorAdapter.

commit | commitdiff | tree

Jean-Baptiste Queru [Tue, 24 Nov 2009 17:22:50 +0000 (09:22 -0800)]

merge from open-source master

commit | commitdiff | tree

Leon Scroggins [Tue, 24 Nov 2009 14:29:17 +0000 (06:29 -0800)]

am ecfc0eba: Fix soft keyboard dismissing itself when zooming into a textfield in browser.

Merge commit 'ecfc0eba609f88579ea5b70c57e6763ee3a28e5d' into eclair-mr2-plus-aosp

* commit 'ecfc0eba609f88579ea5b70c57e6763ee3a28e5d':
Fix soft keyboard dismissing itself when zooming into a textfield in browser.

commit | commitdiff | tree

Dave Sparks [Tue, 24 Nov 2009 04:03:28 +0000 (20:03 -0800)]

am 1e914ac7: am 16cc72bd: Fix simulator build.

Merge commit '1e914ac7fce9523b5a932389798589eba91ca4dd' into eclair-mr2-plus-aosp

* commit '1e914ac7fce9523b5a932389798589eba91ca4dd':
Fix simulator build.

commit | commitdiff | tree

Dave Sparks [Tue, 24 Nov 2009 04:03:03 +0000 (20:03 -0800)]

am ebcb7c31: am 8424ec32: Merge change I0f9a53d4 into eclair

Merge commit 'ebcb7c3167e76c19d4721dbc472772744918e868' into eclair-mr2-plus-aosp

* commit 'ebcb7c3167e76c19d4721dbc472772744918e868':
Set metadata retriever thread group to the caller's group.

commit | commitdiff | tree

Dave Sparks [Tue, 24 Nov 2009 03:58:33 +0000 (19:58 -0800)]

am 16cc72bd: Fix simulator build.

Merge commit '16cc72bdef471ffeee3f61eba8262783de248b04' into eclair-mr2

* commit '16cc72bdef471ffeee3f61eba8262783de248b04':
Fix simulator build.

commit | commitdiff | tree

Dave Sparks [Tue, 24 Nov 2009 03:58:00 +0000 (19:58 -0800)]

am 8424ec32: Merge change I0f9a53d4 into eclair

Merge commit '8424ec323b2bc38887370c75e2c1fcd84bcdb013' into eclair-mr2

* commit '8424ec323b2bc38887370c75e2c1fcd84bcdb013':
Set metadata retriever thread group to the caller's group.

commit | commitdiff | tree

Dan Egnor [Tue, 24 Nov 2009 03:14:23 +0000 (19:14 -0800)]

am b59573cf: Merge change I06fb08c4 into eclair-mr2

Merge commit 'b59573cf53c8f09ac25fe0bfaf1d7067604ee983' into eclair-mr2-plus-aosp

* commit 'b59573cf53c8f09ac25fe0bfaf1d7067604ee983':
Expand db_operation logging to prepare for widespread sample collection:

commit | commitdiff | tree

Android (Google) Code Review [Tue, 24 Nov 2009 03:10:17 +0000 (19:10 -0800)]

Merge change I06fb08c4 into eclair-mr2

* changes:
Expand db_operation logging to prepare for widespread sample collection: - always enable the log, but subsample for queries faster than 100ms - add information about whether it's blocking a main thread - log the entire sql (have not yet added quoted-string-stripping)

commit | commitdiff | tree

Android (Google) Code Review [Tue, 24 Nov 2009 01:58:24 +0000 (17:58 -0800)]

Merge change I0f9a53d4 into eclair

* changes:
Set metadata retriever thread group to the caller's group.

commit | commitdiff | tree

Dave Sparks [Tue, 24 Nov 2009 01:50:22 +0000 (17:50 -0800)]

am f52ebbfc: am 9a219519: Merge change I2d32301b into eclair

Merge commit 'f52ebbfc5d1d1abbf1ad39c1e8308fd4029491fb' into eclair-mr2-plus-aosp

* commit 'f52ebbfc5d1d1abbf1ad39c1e8308fd4029491fb':
Add 4 new notification sounds.

commit | commitdiff | tree

Dave Sparks [Tue, 24 Nov 2009 01:45:57 +0000 (17:45 -0800)]

am 9a219519: Merge change I2d32301b into eclair

Merge commit '9a219519786ce6702c57ec1f1bffe2260fc663a9' into eclair-mr2

* commit '9a219519786ce6702c57ec1f1bffe2260fc663a9':
Add 4 new notification sounds.

commit | commitdiff | tree

Android (Google) Code Review [Tue, 24 Nov 2009 01:42:41 +0000 (17:42 -0800)]

Merge change I2d32301b into eclair

* changes:
Add 4 new notification sounds.

commit | commitdiff | tree

Jason Sams [Tue, 24 Nov 2009 00:24:17 +0000 (16:24 -0800)]

am 6a2500a3: am 39dbb099: Merge change I36176536 into eclair

Merge commit '6a2500a330ef41cbfca40827b60e9f5efdf72db7' into eclair-mr2-plus-aosp

* commit '6a2500a330ef41cbfca40827b60e9f5efdf72db7':
Fix ref counting bug that could cause memory leak in allApps.

commit | commitdiff | tree

Jason Sams [Tue, 24 Nov 2009 00:19:37 +0000 (16:19 -0800)]

am 39dbb099: Merge change I36176536 into eclair

Merge commit '39dbb099974f2c8e1154f28123e53be14c47a76d' into eclair-mr2

* commit '39dbb099974f2c8e1154f28123e53be14c47a76d':
Fix ref counting bug that could cause memory leak in allApps.

commit | commitdiff | tree

Android (Google) Code Review [Tue, 24 Nov 2009 00:14:13 +0000 (16:14 -0800)]

Merge change I36176536 into eclair

* changes:
Fix ref counting bug that could cause memory leak in allApps.

commit | commitdiff | tree

Dianne Hackborn [Tue, 24 Nov 2009 00:03:16 +0000 (16:03 -0800)]

am cfe90ce4: am 05799981: Fix issue #2281046: Size and pressure don\'t change

Merge commit 'cfe90ce461eacf3ae6a8556594a0f682a31cfb84' into eclair-mr2-plus-aosp

* commit 'cfe90ce461eacf3ae6a8556594a0f682a31cfb84':
Fix issue #2281046: Size and pressure don't change

commit | commitdiff | tree

Dianne Hackborn [Mon, 23 Nov 2009 23:58:18 +0000 (15:58 -0800)]

am 05799981: Fix issue #2281046: Size and pressure don\'t change

Merge commit '05799981d8d930e0b929cdb99f9407e3ee18c142' into eclair-mr2

* commit '05799981d8d930e0b929cdb99f9407e3ee18c142':
Fix issue #2281046: Size and pressure don't change

commit | commitdiff | tree

Andreas Huber [Mon, 23 Nov 2009 23:39:26 +0000 (15:39 -0800)]

am 44e15c44: Some playable/decodable streams have been found in the wild that violate this assertion, let\'s be lenient for now.

Merge commit '44e15c44ad10b36bd3649b21ea7432348e2f05f8' into eclair-mr2-plus-aosp

* commit '44e15c44ad10b36bd3649b21ea7432348e2f05f8':
Some playable/decodable streams have been found in the wild that violate this assertion, let's be lenient for now.

commit | commitdiff | tree

Andreas Huber [Mon, 23 Nov 2009 22:42:30 +0000 (14:42 -0800)]

am 1f522294: Merge change I24b0a95d into eclair-mr2

Merge commit '1f52229453c3df8eaeda64133bd332b01589354f' into eclair-mr2-plus-aosp

* commit '1f52229453c3df8eaeda64133bd332b01589354f':
The original delay after which we dropped a frame was too aggressive. 40ms lateness seems more appropriate (about 25fps).

commit | commitdiff | tree

Android (Google) Code Review [Mon, 23 Nov 2009 22:39:03 +0000 (14:39 -0800)]

Merge change I24b0a95d into eclair-mr2

* changes:
The original delay after which we dropped a frame was too aggressive. 40ms lateness seems more appropriate (about 25fps).

commit | commitdiff | tree

Andreas Huber [Mon, 23 Nov 2009 22:31:25 +0000 (14:31 -0800)]

am e71a6408: Merge change I1bceff91 into eclair-mr2

Merge commit 'e71a6408867a80f847cd3f7671f6ef009f67a78e' into eclair-mr2-plus-aosp

* commit 'e71a6408867a80f847cd3f7671f6ef009f67a78e':
Make sure the decoder's input buffers are large enough to hold the largest input data. Verify that the setting actually sticks.

commit | commitdiff | tree

Dirk Dougherty [Mon, 23 Nov 2009 22:31:01 +0000 (14:31 -0800)]

am e0030418: am bca9f1bb: sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels.

Merge commit 'e0030418fd4b9a9a2d0422a5538a76ca6b40710c' into eclair-mr2-plus-aosp

* commit 'e0030418fd4b9a9a2d0422a5538a76ca6b40710c':
sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels.

commit | commitdiff | tree

Eric Olsen [Mon, 23 Nov 2009 22:30:35 +0000 (14:30 -0800)]

am b2796da2: am 0d631b9b: Merge change Ie7096ebb into eclair

Merge commit 'b2796da2ed4d0ef3bd94e187156c3d21e7e2a07f' into eclair-mr2-plus-aosp

* commit 'b2796da2ed4d0ef3bd94e187156c3d21e7e2a07f':
Add logging of headset events to help debug issue.

commit | commitdiff | tree

Android (Google) Code Review [Mon, 23 Nov 2009 22:26:46 +0000 (14:26 -0800)]

Merge change I1bceff91 into eclair-mr2

* changes:
Make sure the decoder's input buffers are large enough to hold the largest input data. Verify that the setting actually sticks.

commit | commitdiff | tree

Dirk Dougherty [Mon, 23 Nov 2009 21:55:50 +0000 (13:55 -0800)]

am bca9f1bb: sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels.

Merge commit 'bca9f1bbb31cf05ba17af049a5ea37f57981f00e' into eclair-mr2

* commit 'bca9f1bbb31cf05ba17af049a5ea37f57981f00e':
sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels.

commit | commitdiff | tree

Eric Olsen [Mon, 23 Nov 2009 21:55:25 +0000 (13:55 -0800)]

am 0d631b9b: Merge change Ie7096ebb into eclair

Merge commit '0d631b9b58db54bee58da717b38b8020bc3d0437' into eclair-mr2

* commit '0d631b9b58db54bee58da717b38b8020bc3d0437':
Add logging of headset events to help debug issue.

commit | commitdiff | tree

Fred Quintana [Mon, 23 Nov 2009 21:47:00 +0000 (13:47 -0800)]

am 4174016d: Merge change I53e3a20e into eclair-mr2

Merge commit '4174016dbd043eda493e9cd1925ed84549c7b3c0' into eclair-mr2-plus-aosp

* commit '4174016dbd043eda493e9cd1925ed84549c7b3c0':
move SubscribedFeeds to GSF

commit | commitdiff | tree

Android (Google) Code Review [Mon, 23 Nov 2009 21:42:24 +0000 (13:42 -0800)]

Merge change I53e3a20e into eclair-mr2

* changes:
move SubscribedFeeds to GSF

commit | commitdiff | tree

Android (Google) Code Review [Mon, 23 Nov 2009 21:20:46 +0000 (13:20 -0800)]

Merge change Ie7096ebb into eclair

* changes:
Add logging of headset events to help debug issue.

commit | commitdiff | tree

Scott Main [Mon, 23 Nov 2009 21:14:01 +0000 (13:14 -0800)]

am 98c11248: am 3fa1cb05: am 5e7f1fbe: Merge change Id2ee762d into eclair-sdk

Merge commit '98c11248becafa61d29aea8a7e10adf418a6c197' into eclair-mr2-plus-aosp

* commit '98c11248becafa61d29aea8a7e10adf418a6c197':
droiddoc change: add flag to offline docs build to signal

commit | commitdiff | tree

Mike Lockwood [Mon, 23 Nov 2009 21:13:39 +0000 (13:13 -0800)]

am e5683369: Merge change I60dfecdc into eclair-mr2

Merge commit 'e5683369d2f3cbda3e6c09c66b4d6df77c9b3c0a' into eclair-mr2-plus-aosp

* commit 'e5683369d2f3cbda3e6c09c66b4d6df77c9b3c0a':
Add window manager support for overriding button and keyboard backlight values.

commit | commitdiff | tree

Scott Main [Mon, 23 Nov 2009 21:09:17 +0000 (13:09 -0800)]

am 3fa1cb05: am 5e7f1fbe: Merge change Id2ee762d into eclair-sdk

Merge commit '3fa1cb059e76d8b83634a4117a7b2ceca438ae7e' into eclair-mr2

* commit '3fa1cb059e76d8b83634a4117a7b2ceca438ae7e':
droiddoc change: add flag to offline docs build to signal

commit | commitdiff | tree

Scott Main [Mon, 23 Nov 2009 21:04:27 +0000 (13:04 -0800)]

am 5e7f1fbe: Merge change Id2ee762d into eclair-sdk

Merge commit '5e7f1fbe161d7015dde6e893351238749f906c8a' into eclair

* commit '5e7f1fbe161d7015dde6e893351238749f906c8a':
droiddoc change: add flag to offline docs build to signal

commit | commitdiff | tree

Android (Google) Code Review [Mon, 23 Nov 2009 20:56:19 +0000 (12:56 -0800)]

Merge change Id2ee762d into eclair-sdk

* changes:
droiddoc change: add flag to offline docs build to signal that we're building offline docs so that we do not generate all of the web pages for the sample apps source code.

commit | commitdiff | tree

Android (Google) Code Review [Mon, 23 Nov 2009 20:20:04 +0000 (12:20 -0800)]

Merge change I60dfecdc into eclair-mr2

* changes:
Add window manager support for overriding button and keyboard backlight values.

commit | commitdiff | tree

Grace Kloba [Mon, 23 Nov 2009 20:12:52 +0000 (12:12 -0800)]

am ed1624d8: Merge change I8ae1b41a into eclair-mr2

Merge commit 'ed1624d8ffa4b7ade511f68d5d985e013df4e03b' into eclair-mr2-plus-aosp

* commit 'ed1624d8ffa4b7ade511f68d5d985e013df4e03b':
Expose some debugging tools of the WebView.

commit | commitdiff | tree

Dan Egnor [Mon, 23 Nov 2009 20:12:28 +0000 (12:12 -0800)]

am 596de923: am 9854deae: (-s ours) Merge change I1691f3d3 into eclair

Merge commit '596de923b23744e693967e1f3a644bb60c3ab30b' into eclair-mr2-plus-aosp

* commit '596de923b23744e693967e1f3a644bb60c3ab30b':
Add CPUFREQ_STATS event tag

commit | commitdiff | tree

Android (Google) Code Review [Mon, 23 Nov 2009 20:07:20 +0000 (12:07 -0800)]

Merge change I8ae1b41a into eclair-mr2

* changes:
Expose some debugging tools of the WebView.

commit | commitdiff | tree

Dan Egnor [Mon, 23 Nov 2009 20:03:47 +0000 (12:03 -0800)]

am 9854deae: (-s ours) Merge change I1691f3d3 into eclair

Merge commit '9854deae10aaf39999a95e440ee3dec939d47179' into eclair-mr2

* commit '9854deae10aaf39999a95e440ee3dec939d47179':
Add CPUFREQ_STATS event tag

commit | commitdiff | tree

Android (Google) Code Review [Mon, 23 Nov 2009 19:57:08 +0000 (11:57 -0800)]

Merge change I1691f3d3 into eclair

* changes:
Add CPUFREQ_STATS event tag DO NOT MERGE

commit | commitdiff | tree

Eric Laurent [Mon, 23 Nov 2009 19:21:01 +0000 (11:21 -0800)]

am 132dab8f: am a0f9a4f7: Merge change I2083b297 into eclair

Merge commit '132dab8f91f5e87581660069753f238ea9914732' into eclair-mr2-plus-aosp

* commit '132dab8f91f5e87581660069753f238ea9914732':
Fix issue 2265111: Loss of downlink audio while listening, and get a MT call.

commit | commitdiff | tree

Eric Laurent [Mon, 23 Nov 2009 19:16:27 +0000 (11:16 -0800)]

am a0f9a4f7: Merge change I2083b297 into eclair

Merge commit 'a0f9a4f73579c2afa4dd82499a69abce94a3f23f' into eclair-mr2

* commit 'a0f9a4f73579c2afa4dd82499a69abce94a3f23f':
Fix issue 2265111: Loss of downlink audio while listening, and get a MT call.

commit | commitdiff | tree

Dianne Hackborn [Mon, 23 Nov 2009 19:12:04 +0000 (11:12 -0800)]

am 41039247: am 8abd5f0d: Fix issue #2267665 IME keyboard appears as Blank in compose view...

Merge commit '4103924742c376716ce5866f6d2f53eac4f3cb59' into eclair-mr2-plus-aosp

* commit '4103924742c376716ce5866f6d2f53eac4f3cb59':
Fix issue #2267665 IME keyboard appears as Blank in compose view...

commit | commitdiff | tree

Android (Google) Code Review [Mon, 23 Nov 2009 19:11:55 +0000 (11:11 -0800)]

Merge change I2083b297 into eclair

* changes:
Fix issue 2265111: Loss of downlink audio while listening, and get a MT call.

commit | commitdiff | tree

Dianne Hackborn [Mon, 23 Nov 2009 19:05:54 +0000 (11:05 -0800)]

am 8abd5f0d: Fix issue #2267665 IME keyboard appears as Blank in compose view...

Merge commit '8abd5f0d519afa787e7c64e429df17ccc661ce75' into eclair-mr2

* commit '8abd5f0d519afa787e7c64e429df17ccc661ce75':
Fix issue #2267665 IME keyboard appears as Blank in compose view...

commit | commitdiff | tree

Andreas Huber [Mon, 23 Nov 2009 18:51:41 +0000 (10:51 -0800)]

am bbd6cb46: Merge change Ib1b7bce4 into eclair-mr2

Merge commit 'bbd6cb463b405fc90912dee470fe6c7b8c6b1f54' into eclair-mr2-plus-aosp

* commit 'bbd6cb463b405fc90912dee470fe6c7b8c6b1f54':
Squashed commit of the following:

commit | commitdiff | tree

Android (Google) Code Review [Mon, 23 Nov 2009 18:46:25 +0000 (10:46 -0800)]

Merge change Ib1b7bce4 into eclair-mr2

* changes:
Squashed commit of the following:

commit | commitdiff | tree

Mike Lockwood [Mon, 23 Nov 2009 18:45:24 +0000 (10:45 -0800)]

am 34c5813e: am 174b7269: Merge change Id886fb28 into eclair

Merge commit '34c5813e488fd4f044e545f177a20f553580ce6a' into eclair-mr2-plus-aosp

* commit '34c5813e488fd4f044e545f177a20f553580ce6a':
Fix deadlock in WindowManagerService.reenableKeyguard()

commit | commitdiff | tree

Mike Lockwood [Mon, 23 Nov 2009 18:40:13 +0000 (10:40 -0800)]

am 174b7269: Merge change Id886fb28 into eclair

Merge commit '174b726917c12d61f9135a180afc8413d845dc2d' into eclair-mr2

* commit '174b726917c12d61f9135a180afc8413d845dc2d':
Fix deadlock in WindowManagerService.reenableKeyguard()

commit | commitdiff | tree

Android (Google) Code Review [Mon, 23 Nov 2009 18:36:32 +0000 (10:36 -0800)]

Merge change Id886fb28 into eclair

* changes:
Fix deadlock in WindowManagerService.reenableKeyguard()

commit | commitdiff | tree

Dan Egnor [Mon, 23 Nov 2009 18:15:34 +0000 (10:15 -0800)]

am cd979d55: Merge change I494a1dc5 into eclair-mr2

Merge commit 'cd979d555fbf991bdc59b3521281786e78e809fc' into eclair-mr2-plus-aosp

* commit 'cd979d555fbf991bdc59b3521281786e78e809fc':
Add OperationScheduler (and test) to the common static library;

commit | commitdiff | tree

Android (Google) Code Review [Mon, 23 Nov 2009 18:10:51 +0000 (10:10 -0800)]

Merge change I494a1dc5 into eclair-mr2

* changes:
Add OperationScheduler (and test) to the common static library; includes new string parsing function (and test).

commit | commitdiff | tree

Daniel Sandler [Mon, 23 Nov 2009 16:50:12 +0000 (08:50 -0800)]

am 40c1dbf0: am a59a01ab: Merge change I43f72dd1 into eclair

Merge commit '40c1dbf081035f878b96dd67ef112eb49001c087' into eclair-mr2-plus-aosp

* commit '40c1dbf081035f878b96dd67ef112eb49001c087':
Don't block TIME_TICK broadcasts in the DigitalClock widget.

commit | commitdiff | tree

Daniel Sandler [Mon, 23 Nov 2009 16:44:27 +0000 (08:44 -0800)]

am a59a01ab: Merge change I43f72dd1 into eclair

Merge commit 'a59a01ab2b959a8a5aeb09dd664d5be193fd8219' into eclair-mr2

* commit 'a59a01ab2b959a8a5aeb09dd664d5be193fd8219':
Don't block TIME_TICK broadcasts in the DigitalClock widget.

commit | commitdiff | tree

Android (Google) Code Review [Mon, 23 Nov 2009 16:39:24 +0000 (08:39 -0800)]

Merge change I43f72dd1 into eclair

* changes:
Don't block TIME_TICK broadcasts in the DigitalClock widget.

commit | commitdiff | tree

Jaikumar Ganesh [Mon, 23 Nov 2009 06:10:15 +0000 (22:10 -0800)]

am 8631e554: am ad431ad8: Merge change Ia3acc2ee into eclair

Merge commit '8631e55425b2ab81eb74396e6834c6f7a4549804' into eclair-mr2-plus-aosp

* commit '8631e55425b2ab81eb74396e6834c6f7a4549804':
Fix pairings lost on reboot.

commit | commitdiff | tree

Jaikumar Ganesh [Mon, 23 Nov 2009 06:02:17 +0000 (22:02 -0800)]

am ad431ad8: Merge change Ia3acc2ee into eclair

Merge commit 'ad431ad8631d8b19b04193ff1f89a955a7643c60' into eclair-mr2

* commit 'ad431ad8631d8b19b04193ff1f89a955a7643c60':
Fix pairings lost on reboot.

commit | commitdiff | tree

Android (Google) Code Review [Mon, 23 Nov 2009 05:54:29 +0000 (21:54 -0800)]

Merge change Ia3acc2ee into eclair

* changes:
Fix pairings lost on reboot.

commit | commitdiff | tree

Dan Egnor [Sat, 21 Nov 2009 02:31:33 +0000 (18:31 -0800)]

Add OperationScheduler (and test) to the common static library;
includes new string parsing function (and test).

commit | commitdiff | tree

Eric Laurent [Sat, 21 Nov 2009 08:26:09 +0000 (00:26 -0800)]

am 949c572a: am e7800946: Merge change I49f02be9 into eclair

Merge commit '949c572a16881aa40079a42bf7682637b23eb16a' into eclair-mr2-plus-aosp

* commit '949c572a16881aa40079a42bf7682637b23eb16a':
Issue 2265163: Audio still reported routed through earpiece on sholes

commit | commitdiff | tree

Eric Laurent [Sat, 21 Nov 2009 08:21:15 +0000 (00:21 -0800)]

am e7800946: Merge change I49f02be9 into eclair

Merge commit 'e7800946a42c0ebe8e0b3f6eba04a96a9641aaff' into eclair-mr2

* commit 'e7800946a42c0ebe8e0b3f6eba04a96a9641aaff':
Issue 2265163: Audio still reported routed through earpiece on sholes

commit | commitdiff | tree

Android (Google) Code Review [Sat, 21 Nov 2009 08:18:24 +0000 (00:18 -0800)]

Merge change I49f02be9 into eclair

* changes:
Issue 2265163: Audio still reported routed through earpiece on sholes

commit | commitdiff | tree

Scott Main [Sat, 21 Nov 2009 01:12:37 +0000 (17:12 -0800)]

am 30a4b8a1: am 256da9fb: am 160ab363: Merge change I0c172ebf into eclair-sdk

Merge commit '30a4b8a180813ae9a1846fdd7219ebe5592eb06b' into eclair-mr2-plus-aosp

* commit '30a4b8a180813ae9a1846fdd7219ebe5592eb06b':
docs change for ESR: add platform notes document for

commit | commitdiff | tree

Scott Main [Sat, 21 Nov 2009 01:08:09 +0000 (17:08 -0800)]

am 256da9fb: am 160ab363: Merge change I0c172ebf into eclair-sdk

Merge commit '256da9fb007ac0722a5b1854befda7e7bed2564e' into eclair-mr2

* commit '256da9fb007ac0722a5b1854befda7e7bed2564e':
docs change for ESR: add platform notes document for

commit | commitdiff | tree

Scott Main [Sat, 21 Nov 2009 01:03:29 +0000 (17:03 -0800)]

am 160ab363: Merge change I0c172ebf into eclair-sdk

Merge commit '160ab363d738728456d561bb80d54d3448e7580a' into eclair

* commit '160ab363d738728456d561bb80d54d3448e7580a':
docs change for ESR: add platform notes document for

commit | commitdiff | tree

Android (Google) Code Review [Sat, 21 Nov 2009 00:59:57 +0000 (16:59 -0800)]

Merge change I0c172ebf into eclair-sdk

* changes:
docs change for ESR: add platform notes document for Android 2.0.1. Also update the homepage sdk and adp announcements.

commit | commitdiff | tree

Dianne Hackborn [Sat, 21 Nov 2009 00:49:21 +0000 (16:49 -0800)]

am dbf3d3ac: am af1f42be: Fix issue #2271668: Live Wallpaper Force-Close when changing from live wallpaper to picasa wallpaper

Merge commit 'dbf3d3acc18f86a671096f1626d80d055bc36e11' into eclair-mr2-plus-aosp

* commit 'dbf3d3acc18f86a671096f1626d80d055bc36e11':
Fix issue #2271668: Live Wallpaper Force-Close when changing from live wallpaper to picasa wallpaper

commit | commitdiff | tree

Dianne Hackborn [Sat, 21 Nov 2009 00:43:20 +0000 (16:43 -0800)]

am af1f42be: Fix issue #2271668: Live Wallpaper Force-Close when changing from live wallpaper to picasa wallpaper

Merge commit 'af1f42be96a6ffa7a9b63e199e1614281ea3282d' into eclair-mr2

* commit 'af1f42be96a6ffa7a9b63e199e1614281ea3282d':
Fix issue #2271668: Live Wallpaper Force-Close when changing from live wallpaper to picasa wallpaper

commit | commitdiff | tree

Dianne Hackborn [Fri, 20 Nov 2009 23:26:50 +0000 (15:26 -0800)]

am f2900600: am 1824ec8c: Merge change If2b0bbed into eclair

Merge commit 'f29006000cfbcf7732df5d5432ab5ff8a2dbf691' into eclair-mr2-plus-aosp

* commit 'f29006000cfbcf7732df5d5432ab5ff8a2dbf691':
Debugging for issue #2228381 android.view.InflateException

commit | commitdiff | tree

Dianne Hackborn [Fri, 20 Nov 2009 23:20:34 +0000 (15:20 -0800)]

am 1824ec8c: Merge change If2b0bbed into eclair

Merge commit '1824ec8c127e3a8ef602d027e3c10d81f28320e8' into eclair-mr2

* commit '1824ec8c127e3a8ef602d027e3c10d81f28320e8':
Debugging for issue #2228381 android.view.InflateException

commit | commitdiff | tree

Android (Google) Code Review [Fri, 20 Nov 2009 23:12:33 +0000 (15:12 -0800)]

Merge change If2b0bbed into eclair

* changes:
Debugging for issue #2228381 android.view.InflateException

commit | commitdiff | tree

Wink Saville [Fri, 20 Nov 2009 23:04:31 +0000 (15:04 -0800)]

am 79ff03a8: Merge change I3ae1fb19 into eclair-mr2

Merge commit '79ff03a84b8f6aa9fc95fba728a131e9c88d1b47' into eclair-mr2-plus-aosp

* commit '79ff03a84b8f6aa9fc95fba728a131e9c88d1b47':
Increase the default wake lock timeout.

commit | commitdiff | tree

Android (Google) Code Review [Fri, 20 Nov 2009 22:56:21 +0000 (14:56 -0800)]

Merge change I3ae1fb19 into eclair-mr2

* changes:
Increase the default wake lock timeout.

commit | commitdiff | tree

Ken Shirriff [Fri, 20 Nov 2009 22:35:22 +0000 (14:35 -0800)]

am f8c2bb36: Add gservices flags for calendar sync.

Merge commit 'f8c2bb36f7b5d49553155559bc30c4e9211340e4' into eclair-mr2-plus-aosp

* commit 'f8c2bb36f7b5d49553155559bc30c4e9211340e4':
Add gservices flags for calendar sync.

commit | commitdiff | tree

Evan Millar [Fri, 20 Nov 2009 22:34:58 +0000 (14:34 -0800)]

am 288509a9: am 633177cb: Move updated 6.xml from eclair-sholes-release into eclair

Merge commit '288509a959d437d75b1cd706431e21ccf911531f' into eclair-mr2-plus-aosp

* commit '288509a959d437d75b1cd706431e21ccf911531f':
Move updated 6.xml from eclair-sholes-release into eclair

commit | commitdiff | tree

Dianne Hackborn [Fri, 20 Nov 2009 22:26:42 +0000 (14:26 -0800)]

Debugging for issue #2228381 android.view.InflateException

Binary XML file line #37: Error inflating class <unknown> after adding a secondary account

Now that I have these debug logs, I want to keep them since they will make
debugging these kinds of issues a lot easier in the future. (Note in this
case there was no problem in the framework.)

Change-Id: If2b0bbeda4706b7c5dc1ba4a5db04b74f40e1543

commit | commitdiff | tree

Evan Millar [Fri, 20 Nov 2009 22:22:30 +0000 (14:22 -0800)]

am 633177cb: Move updated 6.xml from eclair-sholes-release into eclair

Merge commit '633177cbdc21b9e8f2153069965fb6aa30b8cb8f' into eclair-mr2

* commit '633177cbdc21b9e8f2153069965fb6aa30b8cb8f':
Move updated 6.xml from eclair-sholes-release into eclair

commit | commitdiff | tree

Vasu Nori [Fri, 20 Nov 2009 22:14:45 +0000 (14:14 -0800)]

am 5a03f36e: maintain cache of statementids returned by sqlite upon compiling a sql stmnt

Merge commit '5a03f36ef845f73eb4473193dbb0f93dd12a51af' into eclair-mr2-plus-aosp

* commit '5a03f36ef845f73eb4473193dbb0f93dd12a51af':
maintain cache of statementids returned by sqlite upon compiling a sql stmnt

commit | commitdiff | tree

Mike Lockwood [Fri, 20 Nov 2009 21:36:14 +0000 (13:36 -0800)]

am 53e9c126: am a1ce6551: Merge change I69324a33 into eclair

Merge commit '53e9c126f5fc39459554f0290a2c863f645d397a' into eclair-mr2-plus-aosp

* commit '53e9c126f5fc39459554f0290a2c863f645d397a':
AlarmManagerService: Fix daylight savings time offset computation

commit | commitdiff | tree

Mike Lockwood [Fri, 20 Nov 2009 21:32:17 +0000 (13:32 -0800)]

am a1ce6551: Merge change I69324a33 into eclair

Merge commit 'a1ce6551e1fd8a1ed4af58857413c0a7f701b5c2' into eclair-mr2

* commit 'a1ce6551e1fd8a1ed4af58857413c0a7f701b5c2':
AlarmManagerService: Fix daylight savings time offset computation

commit | commitdiff | tree

Android (Google) Code Review [Fri, 20 Nov 2009 21:28:12 +0000 (13:28 -0800)]

Merge change I69324a33 into eclair

* changes:
AlarmManagerService: Fix daylight savings time offset computation

commit | commitdiff | tree

Dirk Dougherty [Fri, 20 Nov 2009 21:18:25 +0000 (13:18 -0800)]

am d47fad27: am 055b4392: Merge change I0a17a960 into eclair

Merge commit 'd47fad27d76527dfa27f6c5425cc4074f6c3a158' into eclair-mr2-plus-aosp

* commit 'd47fad27d76527dfa27f6c5425cc4074f6c3a158':
sdk doc change for esr: Add api diff report 5->6. Update previous diff reports to fix false positives.

commit | commitdiff | tree

Dirk Dougherty [Fri, 20 Nov 2009 21:13:25 +0000 (13:13 -0800)]

am 055b4392: Merge change I0a17a960 into eclair

Merge commit '055b439289f38c5a1d3bd43c0e218a4cbb93773d' into eclair-mr2

* commit '055b439289f38c5a1d3bd43c0e218a4cbb93773d':
sdk doc change for esr: Add api diff report 5->6. Update previous diff reports to fix false positives.

commit | commitdiff | tree

Android (Google) Code Review [Fri, 20 Nov 2009 21:08:06 +0000 (13:08 -0800)]

Merge change I0a17a960 into eclair

* changes:
sdk doc change for esr: Add api diff report 5->6. Update previous diff reports to fix false positives.

commit | commitdiff | tree

Yu Shan Emily Lau [Fri, 20 Nov 2009 20:08:54 +0000 (12:08 -0800)]

am 507322ca: am 9ed314ce: Merge change Ib3191441 into eclair

Merge commit '507322ca5c5b678714314ae87e27d07c89c40785' into eclair-mr2-plus-aosp

* commit '507322ca5c5b678714314ae87e27d07c89c40785':
Add the checking for mediaplayer stress test.

commit | commitdiff | tree

Yu Shan Emily Lau [Fri, 20 Nov 2009 20:03:34 +0000 (12:03 -0800)]

am 9ed314ce: Merge change Ib3191441 into eclair

Merge commit '9ed314cefb5ec711dfcb5527a2a0a6b87a643c24' into eclair-mr2

* commit '9ed314cefb5ec711dfcb5527a2a0a6b87a643c24':
Add the checking for mediaplayer stress test.

commit | commitdiff | tree

Android (Google) Code Review [Fri, 20 Nov 2009 19:59:28 +0000 (11:59 -0800)]

Merge change Ib3191441 into eclair

* changes:
Add the checking for mediaplayer stress test.

commit | commitdiff | tree

Scott Main [Fri, 20 Nov 2009 18:06:15 +0000 (10:06 -0800)]

am 0bbb68fe: am 2a6a149f: am 820a4e7d: docs change for ESD: add samples html pages for offline docs

Merge commit '0bbb68fe290e1c2e4b9c5722fc2dbbd29fc4e336' into eclair-mr2-plus-aosp

* commit '0bbb68fe290e1c2e4b9c5722fc2dbbd29fc4e336':
docs change for ESD: add samples html pages for offline docs

commit | commitdiff | tree

Scott Main [Fri, 20 Nov 2009 18:05:56 +0000 (10:05 -0800)]

am cb596642: am e1611399: am 6d95fc0a: docs for ESR: add docs to bluetooth explainin that discovery should be cancelled before connecting to a device

Merge commit 'cb5966426a51aeb7d02e7f859512d20e084e03ed' into eclair-mr2-plus-aosp

* commit 'cb5966426a51aeb7d02e7f859512d20e084e03ed':
docs for ESR: add docs to bluetooth explainin that discovery should

commit | commitdiff | tree

Scott Main [Fri, 20 Nov 2009 18:00:55 +0000 (10:00 -0800)]

am 2a6a149f: am 820a4e7d: docs change for ESD: add samples html pages for offline docs

Merge commit '2a6a149fc2abfb8ef654ed36ce4524209f5e33bc' into eclair-mr2

* commit '2a6a149fc2abfb8ef654ed36ce4524209f5e33bc':
docs change for ESD: add samples html pages for offline docs

commit | commitdiff | tree

Scott Main [Fri, 20 Nov 2009 18:00:28 +0000 (10:00 -0800)]

am e1611399: am 6d95fc0a: docs for ESR: add docs to bluetooth explainin that discovery should be cancelled before connecting to a device

Merge commit 'e16113998bb10f39ee1384bfc497aceeeb193440' into eclair-mr2

* commit 'e16113998bb10f39ee1384bfc497aceeeb193440':
docs for ESR: add docs to bluetooth explainin that discovery should