OSDN Git Service
Scott Main [Mon, 23 Nov 2009 21:18:47 +0000 (13:18 -0800)]
am
ea5c440b: am
98c11248: am
3fa1cb05: am
5e7f1fbe: Merge change Id2ee762d into eclair-sdk
Merge commit '
ea5c440b4fba2f2f21aa0db898db3ad27b2c8be8'
* commit '
ea5c440b4fba2f2f21aa0db898db3ad27b2c8be8':
droiddoc change: add flag to offline docs build to signal
Mike Lockwood [Mon, 23 Nov 2009 21:18:19 +0000 (13:18 -0800)]
am
fa351d38: am
e5683369: Merge change I60dfecdc into eclair-mr2
Merge commit '
fa351d388d0441432f4e616ef87a5c97a088dd04'
* commit '
fa351d388d0441432f4e616ef87a5c97a088dd04':
Add window manager support for overriding button and keyboard backlight values.
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
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.
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
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.
Grace Kloba [Mon, 23 Nov 2009 20:17:33 +0000 (12:17 -0800)]
am
f40abf42: am
ed1624d8: Merge change I8ae1b41a into eclair-mr2
Merge commit '
f40abf427e614b850dfb3723622af3e6039a9815'
* commit '
f40abf427e614b850dfb3723622af3e6039a9815':
Expose some debugging tools of the WebView.
Dan Egnor [Mon, 23 Nov 2009 20:17:08 +0000 (12:17 -0800)]
am
13ea1204: am
596de923: am
9854deae: (-s ours) Merge change I1691f3d3 into eclair
Merge commit '
13ea12044d03f3e5b2f98eddd442afe5acf69485'
* commit '
13ea12044d03f3e5b2f98eddd442afe5acf69485':
Add CPUFREQ_STATS event tag
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
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.
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
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:25:58 +0000 (11:25 -0800)]
am
6ed9c32c: am
132dab8f: am
a0f9a4f7: Merge change I2083b297 into eclair
Merge commit '
6ed9c32c04d7f57bf66835c481a17b254762cea3'
* commit '
6ed9c32c04d7f57bf66835c481a17b254762cea3':
Fix issue
2265111: Loss of downlink audio while listening, and get a MT call.
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.
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.
Dianne Hackborn [Mon, 23 Nov 2009 19:15:56 +0000 (11:15 -0800)]
am
1f0a0ed5: am
41039247: am
8abd5f0d: Fix issue #
2267665 IME keyboard appears as Blank in compose view...
Merge commit '
1f0a0ed549f79c4ad6d783c93319d6807ab88847'
* commit '
1f0a0ed549f79c4ad6d783c93319d6807ab88847':
Fix issue #
2267665 IME keyboard appears as Blank in compose view...
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...
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
Andreas Huber [Mon, 23 Nov 2009 18:55:40 +0000 (10:55 -0800)]
am
5493df91: am
bbd6cb46: Merge change Ib1b7bce4 into eclair-mr2
Merge commit '
5493df919b01952857eb3b78fad3fe2cff573935'
* commit '
5493df919b01952857eb3b78fad3fe2cff573935':
Squashed commit of the following:
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:
Mike Lockwood [Mon, 23 Nov 2009 18:51:25 +0000 (10:51 -0800)]
am
1866591c: am
34c5813e: am
174b7269: Merge change Id886fb28 into eclair
Merge commit '
1866591c192a434c3edcafb808e31b8262cadeb2'
* commit '
1866591c192a434c3edcafb808e31b8262cadeb2':
Fix deadlock in WindowManagerService.reenableKeyguard()
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:
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()
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.
Dan Egnor [Mon, 23 Nov 2009 18:21:26 +0000 (10:21 -0800)]
am
d0a1101f: am
cd979d55: Merge change I494a1dc5 into eclair-mr2
Merge commit '
d0a1101f1df69bcaee81ad4d4fcf9509257e738c'
* commit '
d0a1101f1df69bcaee81ad4d4fcf9509257e738c':
Add OperationScheduler (and test) to the common static library;
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;
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:55:21 +0000 (08:55 -0800)]
am
0182aa35: am
40c1dbf0: am
a59a01ab: Merge change I43f72dd1 into eclair
Merge commit '
0182aa354f996ce43362cd7d1a04012ea9269f41'
* commit '
0182aa354f996ce43362cd7d1a04012ea9269f41':
Don't block TIME_TICK broadcasts in the DigitalClock widget.
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.
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:17:07 +0000 (22:17 -0800)]
am
09e27c4a: am
8631e554: am
ad431ad8: Merge change Ia3acc2ee into eclair
Merge commit '
09e27c4a9cc5bbddc2e18d66d396ee2cf4d753a3'
* commit '
09e27c4a9cc5bbddc2e18d66d396ee2cf4d753a3':
Fix pairings lost on reboot.
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.
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:29:36 +0000 (00:29 -0800)]
am
86526461: am
949c572a: am
e7800946: Merge change I49f02be9 into eclair
Merge commit '
8652646105a6ace559280b579ee8935541ada6c1'
* commit '
8652646105a6ace559280b579ee8935541ada6c1':
Issue
2265163: Audio still reported routed through earpiece on sholes
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
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:19:51 +0000 (17:19 -0800)]
am
acedb7d0: am
30a4b8a1: am
256da9fb: am
160ab363: Merge change I0c172ebf into eclair-sdk
Merge commit '
acedb7d0c3452ff7347fec8f643034e938a55137'
* commit '
acedb7d0c3452ff7347fec8f643034e938a55137':
docs change for ESR: add platform notes document for
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
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
Dianne Hackborn [Sat, 21 Nov 2009 00:54:36 +0000 (16:54 -0800)]
am
131a5ee9: am
dbf3d3ac: am
af1f42be: Fix issue #
2271668: Live Wallpaper Force-Close when changing from live wallpaper to picasa wallpaper
Merge commit '
131a5ee9aeadb9057847a437a669dd61573f5c88'
* commit '
131a5ee9aeadb9057847a437a669dd61573f5c88':
Fix issue #
2271668: Live Wallpaper Force-Close when changing from live wallpaper to picasa wallpaper
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: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
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:31:17 +0000 (15:31 -0800)]
am
e71db657: am
f2900600: am
1824ec8c: Merge change If2b0bbed into eclair
Merge commit '
e71db6579c2afe06fe95dd88217a667d18fe4e20'
* commit '
e71db6579c2afe06fe95dd88217a667d18fe4e20':
Debugging for issue #
2228381 android.view.InflateException
Wink Saville [Fri, 20 Nov 2009 23:30:51 +0000 (15:30 -0800)]
am
2111be3f: am
79ff03a8: Merge change I3ae1fb19 into eclair-mr2
Merge commit '
2111be3f9c1059222c08814e81de6ab55be222c0'
* commit '
2111be3f9c1059222c08814e81de6ab55be222c0':
Increase the default wake lock timeout.
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
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
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.
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 22:40:48 +0000 (14:40 -0800)]
am
10a02fb7: am
f8c2bb36: Add gservices flags for calendar sync.
Merge commit '
10a02fb7e44dfd50132386e04f39b35b00b84e0e'
* commit '
10a02fb7e44dfd50132386e04f39b35b00b84e0e':
Add gservices flags for calendar sync.
Evan Millar [Fri, 20 Nov 2009 22:40:07 +0000 (14:40 -0800)]
am
e1e5ff37: am
288509a9: am
633177cb: Move updated 6.xml from eclair-sholes-release into eclair
Merge commit '
e1e5ff3742fb8a72eec9d5ddc52adae4b80b8ad3'
* commit '
e1e5ff3742fb8a72eec9d5ddc52adae4b80b8ad3':
Move updated 6.xml from eclair-sholes-release into eclair
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.
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
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
Vasu Nori [Fri, 20 Nov 2009 22:19:49 +0000 (14:19 -0800)]
am
483ae632: am
5a03f36e: maintain cache of statementids returned by sqlite upon compiling a sql stmnt
Merge commit '
483ae6328701d29e9731af25c64b09b1e18bc2e7'
* commit '
483ae6328701d29e9731af25c64b09b1e18bc2e7':
maintain cache of statementids returned by sqlite upon compiling a sql stmnt
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
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:42:29 +0000 (13:42 -0800)]
am
589f8d7d: am
53e9c126: am
a1ce6551: Merge change I69324a33 into eclair
Merge commit '
589f8d7d414b132afcef4405122fdf02228f3c8b'
* commit '
589f8d7d414b132afcef4405122fdf02228f3c8b':
AlarmManagerService: Fix daylight savings time offset computation
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
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:22:59 +0000 (13:22 -0800)]
am
b11f8a21: am
d47fad27: am
055b4392: Merge change I0a17a960 into eclair
Merge commit '
b11f8a216f326a96bbdb08b470a7de8c2fa81edf'
* commit '
b11f8a216f326a96bbdb08b470a7de8c2fa81edf':
sdk doc change for esr: Add api diff report 5->6. Update previous diff reports to fix false positives.
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.
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:13:26 +0000 (12:13 -0800)]
am
c6bb089d: am
507322ca: am
9ed314ce: Merge change Ib3191441 into eclair
Merge commit '
c6bb089df15c25948757f6dbd9007fc0d49bb568'
* commit '
c6bb089df15c25948757f6dbd9007fc0d49bb568':
Add the checking for mediaplayer stress test.
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.
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
Android (Google) Code Review [Fri, 20 Nov 2009 18:48:57 +0000 (10:48 -0800)]
Merge change I8e7241a9
* changes:
Make apicheck happy.
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:11:13 +0000 (10:11 -0800)]
am
60f6b6f8: am
0bbb68fe: am
2a6a149f: am
820a4e7d: docs change for ESD: add samples html pages for offline docs
Merge commit '
60f6b6f86f3a8f12f0260c55f7cb40b8f72da941'
* commit '
60f6b6f86f3a8f12f0260c55f7cb40b8f72da941':
docs change for ESD: add samples html pages for offline docs
Scott Main [Fri, 20 Nov 2009 18:10:49 +0000 (10:10 -0800)]
am
7dba47c8: 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 '
7dba47c866b126d26dec2afe18164ce73016bc46'
* commit '
7dba47c866b126d26dec2afe18164ce73016bc46':
docs for ESR: add docs to bluetooth explainin that discovery should