OSDN Git Service
Jim Miller [Tue, 24 Nov 2009 22:04:44 +0000 (14:04 -0800)]
am
35cdb484: Merge change I6c6c166b into eclair
Merge commit '
35cdb484928b34fd517e49e200aa79aa64b4eeb4' into eclair-mr2
* commit '
35cdb484928b34fd517e49e200aa79aa64b4eeb4':
Fix
2268841: Updated portrait tab lockscreen to match latest PPL.
Android (Google) Code Review [Tue, 24 Nov 2009 22:00:54 +0000 (14:00 -0800)]
Merge change I6c6c166b into eclair
* changes:
Fix
2268841: Updated portrait tab lockscreen to match latest PPL.
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.
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
Swarna Kumar [Tue, 24 Nov 2009 19:02:37 +0000 (11:02 -0800)]
Temporarily add explicit step to disable keyguard to imf tests to attempt solve test flakiness.
Bug number :
2177113
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.
Jason Sams [Tue, 24 Nov 2009 20:26:35 +0000 (12:26 -0800)]
Force a crash under conditions where white square bug in all apps is likely to occur.
Fred Quintana [Tue, 24 Nov 2009 17:47:01 +0000 (09:47 -0800)]
moved the gdata library to vendor/google
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.
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.
Leon Scroggins [Thu, 19 Nov 2009 18:47:46 +0000 (13:47 -0500)]
Fix soft keyboard dismissing itself when zooming into a textfield in browser.
We remove the WebTextView while zooming. If the WebTextView ended up
offscreen, we remove it completely, thus hiding the IME. In some cases,
however, the WebTextView is only offscreen because the IME overlapped it.
Check to see if the IME is showing, and if so, adjust the WebTextView and
let it get scrolled into view.
Also perform the removal/change in text size inside the method, so it
happens in both places.
Lastly, do not call didUpdateTextViewBounds if there is no WebTextView.
Fix for http://b/issue?id=
2266066
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.
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.
Dave Sparks [Tue, 24 Nov 2009 03:51:33 +0000 (19:51 -0800)]
Fix simulator build.
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)
Dan Egnor [Mon, 23 Nov 2009 22:47:45 +0000 (14:47 -0800)]
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)
Jim Miller [Tue, 24 Nov 2009 02:21:51 +0000 (18:21 -0800)]
Fix
2268841: Updated portrait tab lockscreen to match latest PPL.
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.
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.
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.
Dave Sparks [Tue, 24 Nov 2009 01:23:35 +0000 (17:23 -0800)]
Add 4 new notification sounds.
Dave Sparks [Tue, 24 Nov 2009 00:51:15 +0000 (16:51 -0800)]
Set metadata retriever thread group to the caller's group.
This patch modifies the native binder interface to the metadata
retriever to pass the caller's thread group across the binder
interface. On the server side, the thread scheduler group is
set to the caller's scheduler group temporarily and restored
after the request has completed. This patch also reverts a
previous patch where the priority of the thread was forced to
a low priority foreground thread.
This should give apps more control over the priority of their
metadata retrieval, particularly allow background process to
run without hogging the CPU.
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.
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.
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
Dianne Hackborn [Mon, 23 Nov 2009 21:08:14 +0000 (13:08 -0800)]
Fix issue #
2281046: Size and pressure don't change
Change-Id: Iadc1d438a494bb1495ee6d93d0dd3b4a491a378f
Jason Sams [Mon, 23 Nov 2009 23:27:33 +0000 (15:27 -0800)]
Fix ref counting bug that could cause memory leak in allApps.
Andreas Huber [Mon, 23 Nov 2009 22:39:38 +0000 (14:39 -0800)]
Some playable/decodable streams have been found in the wild that violate this assertion, let's be lenient for now.
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).
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.
Andreas Huber [Mon, 23 Nov 2009 22:03:32 +0000 (14:03 -0800)]
Make sure the decoder's input buffers are large enough to hold the largest input data. Verify that the setting actually sticks.
Andreas Huber [Mon, 23 Nov 2009 22:02:00 +0000 (14:02 -0800)]
The original delay after which we dropped a frame was too aggressive. 40ms lateness seems more appropriate (about 25fps).
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.
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.
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
Dirk Dougherty [Thu, 19 Nov 2009 07:06:16 +0000 (23:06 -0800)]
sdk doc change for esr: updates for android 1.6 r2, tools r4, api levels.
Bug:
2160782
Change-Id: Ia576dc9b2312d89bbe194d94640c3cc79216067b
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.
Fred Quintana [Mon, 23 Nov 2009 19:35:24 +0000 (11:35 -0800)]
move SubscribedFeeds to GSF
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
Eric Olsen [Mon, 23 Nov 2009 21:06:07 +0000 (13:06 -0800)]
Add logging of headset events to help debug issue.
Signed-off-by: Eric Olsen <eolsen@android.com>
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
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.
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.
Mike Lockwood [Fri, 20 Nov 2009 16:31:18 +0000 (11:31 -0500)]
Add window manager support for overriding button and keyboard backlight values.
The new backlightBrightness field works similarly as the existing WindowManager.LayoutParams.screenBrightness field
Needed for bugs:
b/
2233655 (under low ambient light the touch keys remain illuminated during video playback and never timeout)
b/
2221079 (Backlight for home/search/back/etc buttons should turn off when in dock in night mode)
Change-Id: I60dfecdc7bb653b0db38094464de651220b3d438
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.
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
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
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.
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.
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...
Dianne Hackborn [Sat, 21 Nov 2009 02:09:03 +0000 (18:09 -0800)]
Fix issue #
2267665 IME keyboard appears as Blank in compose view...
...if you re-lunch messaging application after deleting the
character and pressing home key
Change-Id: Idc7da05e54730958644e80069764237e5db6f288
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:
Andreas Huber [Fri, 20 Nov 2009 17:32:46 +0000 (09:32 -0800)]
Squashed commit of the following:
commit
1efc38dc3c33fef57b759002db3965ed07a28cb0
Author: Andreas Huber <andih@google.com>
Date: Thu Nov 19 14:36:14 2009 -0800
Sending the SEEK-COMPLETE notification temporarily broke seeking backwards in time behaviour. This is now fixed.
Also, get rid of the semi-random delay after posting buffers to surface flinger in favour of delaying the buffer release until the next frame is displayed.
commit
51973062eb5ee63fd64b845d72bac517cc3369cf
Author: Andreas Huber <andih@google.com>
Date: Wed Nov 18 14:01:43 2009 -0800
Fix one more unit test, properly send seek-complete notification only after seek actually completed.
commit
cb22250b34b1fcfe1bf459723a761fd003950229
Author: Andreas Huber <andih@google.com>
Date: Wed Nov 18 12:31:36 2009 -0800
Fix seek-while-paused in AwesomePlayer, revert to using FileSource if MmapSource fails.
commit
25eb9241138ddf7bb27ce90657116c5f8a94d880
Author: Andreas Huber <andih@google.com>
Date: Wed Nov 18 12:30:40 2009 -0800
Support seeking and duration in AMRExtractor, assuming all frames are the same size.
commit
44192f2ebb7ea3bbd3ba5910025692dbc6a08faa
Author: Andreas Huber <andih@google.com>
Date: Wed Nov 18 10:21:44 2009 -0800
MediaPlayerImpl is dead, long live AwesomePlayer.
commit
c5b52d3c0674f5dc94db506afbce52401cceddac
Author: Andreas Huber <andih@google.com>
Date: Wed Nov 18 09:42:23 2009 -0800
New implementation of the stagefright mediaplayer.
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()
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()
Grace Kloba [Mon, 23 Nov 2009 18:35:34 +0000 (10:35 -0800)]
Expose some debugging tools of the WebView.
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).
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.
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.
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.
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.
Mike Lockwood [Sun, 22 Nov 2009 06:42:24 +0000 (01:42 -0500)]
Fix deadlock in WindowManagerService.reenableKeyguard()
If reenableKeyguard() is called before the previous disableKeyguard() call is processed,
then TokenWatcher.sendNotificationLocked() will cancel the request, resulting in neither
the TokenWatcher acquired() or released() methods being called.
In that case, reenableKeyguard() will hang waiting for released() to set
mWaitingUntilKeyguardReenabled to false. Now we only wait in reenableKeyguard()
if the TokenWatcher acquired() method is called and the keyguard has actually been disabled.
This should fix bug b/
2270192
Change-Id: Id886fb28df607dbb4543124f2db6997121d6a682
Signed-off-by: Mike Lockwood <lockwood@android.com>
Dan Egnor [Sat, 21 Nov 2009 19:06:50 +0000 (11:06 -0800)]
Add CPUFREQ_STATS event tag
DO NOT MERGE
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).
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
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
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
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
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.
Daniel Sandler [Fri, 20 Nov 2009 19:40:00 +0000 (14:40 -0500)]
Don't block TIME_TICK broadcasts in the DigitalClock widget.
This change applies the fix -- originally by phanna in
https://android-git.corp.google.com/g/#change,33669 -- to
the com.android.internal.widget version of DigitalClock,
which is used by the keyguard and pattern lock screens.
Change-Id: I43f72dd144423e55f73ba52903d52163c8f65591
Scott Main [Thu, 19 Nov 2009 09:32:48 +0000 (01:32 -0800)]
docs change for ESR: add platform notes document for
Android 2.0.1. Also update the homepage sdk and adp announcements.
Bug:
2160782
Change-Id: I0c172ebf9449ac99865433b51a0a7366aa2ef020
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
Dianne Hackborn [Sat, 21 Nov 2009 00:27:27 +0000 (16:27 -0800)]
Fix issue #
2271668: Live Wallpaper Force-Close when changing from live wallpaper to picasa wallpaper
The detach of the wallpaper engine was coming in after the containing
service was destroyed. This was possible because these are different
IPC interfaces so will not be serialized. The fix is to keep track
of all of the active engines in the serice, and detach any remaining
ones when the service is destroyed.
Change-Id: I8810786a777dd4f7b15cfbd2e0da25866a4f3ec5
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
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
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.
Ken Shirriff [Fri, 20 Nov 2009 02:00:16 +0000 (18:00 -0800)]
Add gservices flags for calendar sync.
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
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
Evan Millar [Fri, 20 Nov 2009 21:38:58 +0000 (13:38 -0800)]
Move updated 6.xml from eclair-sholes-release into eclair
bc_triaged bug: http://b/issue?id=
2277456
Dr. No: Xav
Vasu Nori [Tue, 20 Oct 2009 22:16:35 +0000 (15:16 -0700)]
maintain cache of statementids returned by sqlite upon compiling a sql stmnt
Jaikumar Ganesh [Fri, 20 Nov 2009 21:41:07 +0000 (13:41 -0800)]
Fix pairings lost on reboot.
Bug:
2277376
Dr No:Eastham
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
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
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.
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.
Mike Lockwood [Fri, 20 Nov 2009 20:12:51 +0000 (15:12 -0500)]
AlarmManagerService: Fix daylight savings time offset computation
Fixes b/
2244560 (Time Stamp On Bug Reports And Pictures Is One Hour Off)
Change-Id: I69324a33f80e41ce68a0e6fdba08b80ed9453e19
Signed-off-by: Mike Lockwood <lockwood@android.com>
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.
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.
Yu Shan Emily Lau [Fri, 20 Nov 2009 19:50:39 +0000 (11:50 -0800)]
Add the checking for mediaplayer stress test.
Dirk Dougherty [Thu, 19 Nov 2009 00:52:02 +0000 (16:52 -0800)]
sdk doc change for esr: Add api diff report 5->6. Update previous diff reports to fix false positives.
Bug:
2160782
Change-Id: I0a17a9603b53a46a3a434f29bcd72208af1a745b
Scott Main [Fri, 20 Nov 2009 18:44:21 +0000 (10:44 -0800)]
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.
This depends on change 33762 (sha I06c40454), meaning, this
will break the build without that.
Change-Id: Id2ee762de13f23c3da15d55e763c1838b11ac31c
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
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
Scott Main [Fri, 20 Nov 2009 17:54:52 +0000 (09:54 -0800)]
am
820a4e7d: docs change for ESD: add samples html pages for offline docs
Merge commit '
820a4e7dd6adeff162a92ca40ebe2f109561036b' into eclair
* commit '
820a4e7dd6adeff162a92ca40ebe2f109561036b':
docs change for ESD: add samples html pages for offline docs
Scott Main [Fri, 20 Nov 2009 17:54:22 +0000 (09:54 -0800)]
am
6d95fc0a: docs for ESR: add docs to bluetooth explainin that discovery should be cancelled before connecting to a device
Merge commit '
6d95fc0a2ca910212a43c4547c0ef000659b72dc' into eclair
* commit '
6d95fc0a2ca910212a43c4547c0ef000659b72dc':
docs for ESR: add docs to bluetooth explainin that discovery should
Mike Lockwood [Fri, 20 Nov 2009 16:50:21 +0000 (11:50 -0500)]
IPowerManager: remove some unused methods.
Change-Id: I7c7fa7eaf6c99e723da20939c27fbc172ad51613
Signed-off-by: Mike Lockwood <lockwood@android.com>
Eric Laurent [Fri, 20 Nov 2009 15:26:56 +0000 (07:26 -0800)]
Fix issue
2265111: Loss of downlink audio while listening, and get a MT call.
The cause of the problem is that under certain circumstance the HeadsetObserver receives unexpected connection events. For instance,
when removing a bad quality 3.5mm stereo jack without mic the following events can be received:
1 connection of a headset with mic
2 removal of a headset with mic.
The result is that the no mic headset is never disconnected and audio policy manager considers it is still present. Then the music or downlink call audio is always routed to headset even if none is connected giving the impression that audio is lost, except whne you reconnect a headset of enable speaker phone.
The fix consists in adding more checks in HeadsetObserver to reject illegal transitions in headset state received from event observer.
Ben Murdoch [Fri, 20 Nov 2009 10:55:20 +0000 (10:55 +0000)]
Re-run update-api to fix the build.
Change-Id: If0f44e639ab96ccbf3cd1566184dcee595f6f0f8
Ben Murdoch [Thu, 19 Nov 2009 18:14:53 +0000 (18:14 +0000)]
Rename WebChromeClient.addMessageToConsole to WebChromeClient.onConsoleMessage.
BUG=b/
2271636
Change-Id: Ia9bed430c624c4c3745904c98fb2e27632d929f9