Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a27865a authored by Mike Cleron's avatar Mike Cleron Committed by Android Git Automerger
Browse files

am d54261aa: Merge change Id6c0b844 into eclair 

Merge commit 'd54261aa' into eclair-mr2

* commit 'd54261aa':
  Unbreak setting photos as wallpaper
parents b2d7c60f d54261aa

services/java/com/android/server/WallpaperManagerService.java

+6 −0
Original line number Diff line number Diff line
@@ -126,6 +126,11 @@ class WallpaperManagerService extends IWallpaperManager.Stub { 
    int mWidth = -1;

    int mHeight = -1;

    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;

    WallpaperConnection mWallpaperConnection;

    long mLastDiedTime;
@@ -366,6 +371,7 @@ class WallpaperManagerService extends IWallpaperManager.Stub { 
                    // See if there is a default wallpaper component specified

                    // Only look for this if the wallpaper is not being set to a bitmap

                    realComponentName = ComponentName.unflattenFromString(defaultComponent);

                    componentName = realComponentName;

                }

                if (realComponentName == null) {

                    // Fall back to static image wallpaper