Merge commit 'd0a1101f1df69bcaee81ad4d4fcf9509257e738c'
* commit 'd0a1101f1df69bcaee81ad4d4fcf9509257e738c':
Add OperationScheduler (and test) to the common static library;
Merge commit 'cd979d555fbf991bdc59b3521281786e78e809fc' into eclair-mr2-plus-aosp
* commit 'cd979d555fbf991bdc59b3521281786e78e809fc':
Add OperationScheduler (and test) to the common static library;
Merge commit '8631e55425b2ab81eb74396e6834c6f7a4549804' into eclair-mr2-plus-aosp
* commit '8631e55425b2ab81eb74396e6834c6f7a4549804':
Fix pairings lost on reboot.
Merge commit 'ad431ad8631d8b19b04193ff1f89a955a7643c60' into eclair-mr2
* commit 'ad431ad8631d8b19b04193ff1f89a955a7643c60':
Fix pairings lost on reboot.
Merge commit '949c572a16881aa40079a42bf7682637b23eb16a' into eclair-mr2-plus-aosp
* commit '949c572a16881aa40079a42bf7682637b23eb16a':
Issue 2265163: Audio still reported routed through earpiece on sholes
Merge commit 'e7800946a42c0ebe8e0b3f6eba04a96a9641aaff' into eclair-mr2
* commit 'e7800946a42c0ebe8e0b3f6eba04a96a9641aaff':
Issue 2265163: Audio still reported routed through earpiece on sholes
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
Merge commit '131a5ee9aeadb9057847a437a669dd61573f5c88'
* commit '131a5ee9aeadb9057847a437a669dd61573f5c88':
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
Merge commit 'af1f42be96a6ffa7a9b63e199e1614281ea3282d' into eclair-mr2
* commit 'af1f42be96a6ffa7a9b63e199e1614281ea3282d':
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
Merge commit '79ff03a84b8f6aa9fc95fba728a131e9c88d1b47' into eclair-mr2-plus-aosp
* commit '79ff03a84b8f6aa9fc95fba728a131e9c88d1b47':
Increase the default wake lock timeout.
Merge commit '288509a959d437d75b1cd706431e21ccf911531f' into eclair-mr2-plus-aosp
* commit '288509a959d437d75b1cd706431e21ccf911531f':
Move updated 6.xml from eclair-sholes-release into eclair
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
Merge commit '633177cbdc21b9e8f2153069965fb6aa30b8cb8f' into eclair-mr2
* commit '633177cbdc21b9e8f2153069965fb6aa30b8cb8f':
Move updated 6.xml from eclair-sholes-release into eclair
Merge commit '483ae6328701d29e9731af25c64b09b1e18bc2e7'
* commit '483ae6328701d29e9731af25c64b09b1e18bc2e7':
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
