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

am 0a27865a: am d54261aa: Merge change Id6c0b844 into eclair

Browse Source 
Merge commit '0a27865a015d9e0401b6b3bff9eedd06d59043b3' into eclair-mr2-plus-aosp

* commit '0a27865a015d9e0401b6b3bff9eedd06d59043b3':
  Unbreak setting photos as wallpaper
This commit is contained in:
Mike Cleron
2009-11-13 17:07:29 -08:00
committed by Android Git Automerger
parent 85a612d03e 0a27865a01
commit c035590541
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -126,6 +126,11 @@ class WallpaperManagerService extends IWallpaperManager.Stub {
int mWidth = -1; int mWidth = -1;
int mHeight = -1; int mHeight = -1;
String mName = ""; String mName = "";
/**
* The component name of the currently set live wallpaper. This will be null if the
* wallpaper uses the built in ImageWallpaper component to display a bitmap.
*/
ComponentName mWallpaperComponent; ComponentName mWallpaperComponent;
WallpaperConnection mWallpaperConnection; WallpaperConnection mWallpaperConnection;
long mLastDiedTime; long mLastDiedTime;
@@ -366,6 +371,7 @@ class WallpaperManagerService extends IWallpaperManager.Stub {
// See if there is a default wallpaper component specified // See if there is a default wallpaper component specified
// Only look for this if the wallpaper is not being set to a bitmap // Only look for this if the wallpaper is not being set to a bitmap
realComponentName = ComponentName.unflattenFromString(defaultComponent); realComponentName = ComponentName.unflattenFromString(defaultComponent);
componentName = realComponentName;
} }
if (realComponentName == null) { if (realComponentName == null) {
// Fall back to static image wallpaper // Fall back to static image wallpaper