Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change Ie3ab4d0f

Browse Source 
* changes:
  Restore live wallpapers if specified in the restore data
This commit is contained in:
Android (Google) Code Review
2009-12-16 16:01:58 -08:00
parent b9bbb638c3 e3ab4d0f18
commit 4769f6ef5e
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/java/com/android/server/WallpaperManagerService.java
View File

@@ -394,7 +394,7 @@ class WallpaperManagerService extends IWallpaperManager.Stub {
if (defaultComponent != null) {
// See if there is a default wallpaper component specified
componentName = ComponentName.unflattenFromString(defaultComponent);
if (DEBUG) Log.v(TAG, "Use default component walpaper:" + componentName);
if (DEBUG) Log.v(TAG, "Use default component wallpaper:" + componentName);
}
if (componentName == null) {
// Fall back to static image wallpaper
@@ -635,8 +635,14 @@ class WallpaperManagerService extends IWallpaperManager.Stub {
loadSettingsLocked();
if (mNextWallpaperComponent != null &&
!mNextWallpaperComponent.equals(mImageWallpaperComponent)) {
// We can't restore live wallpapers, so just go with the default
bindWallpaperComponentLocked(null);
try {
bindWallpaperComponentLocked(mNextWallpaperComponent);
} catch (IllegalArgumentException e) {
// No such live wallpaper or other failure; fall back to the default
// live wallpaper (since the profile being restored indicated that the
// user had selected a live rather than static one).
bindWallpaperComponentLocked(null);
}
success = true;
} else {
// If there's a wallpaper name, we use that. If that can't be loaded, then we