diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2011-01-13 10:26:19 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-13 10:26:19 -0800 |
| commit | b841fa63026803093c093ad25ab0ccbd4c49e45b (patch) | |
| tree | 2b0a773a42ac1fd669a9fd84774bf1fdf85f54e4 /core/java/android/service/wallpaper | |
| parent | fad58bd4f0d18e439c6f83f1bcf6dbe715708edd (diff) | |
| parent | 54f428a63f33f4722c09b7688e6ca7960394f81f (diff) | |
| download | frameworks_base-b841fa63026803093c093ad25ab0ccbd4c49e45b.zip frameworks_base-b841fa63026803093c093ad25ab0ccbd4c49e45b.tar.gz frameworks_base-b841fa63026803093c093ad25ab0ccbd4c49e45b.tar.bz2 | |
am 54f428a6: am bdb7aee0: Merge "Fix for crash when setting live wallpaper."
* commit '54f428a63f33f4722c09b7688e6ca7960394f81f':
Fix for crash when setting live wallpaper.
Diffstat (limited to 'core/java/android/service/wallpaper')
| -rw-r--r-- | core/java/android/service/wallpaper/WallpaperService.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/core/java/android/service/wallpaper/WallpaperService.java b/core/java/android/service/wallpaper/WallpaperService.java index 52b0643..a859e3c 100644 --- a/core/java/android/service/wallpaper/WallpaperService.java +++ b/core/java/android/service/wallpaper/WallpaperService.java @@ -517,8 +517,11 @@ public abstract class WallpaperService extends Service { mLayout.windowAnimations = com.android.internal.R.style.Animation_Wallpaper; mInputChannel = new InputChannel(); - mSession.add(mWindow, mLayout, View.VISIBLE, mContentInsets, - mInputChannel); + if (mSession.add(mWindow, mLayout, View.VISIBLE, mContentInsets, + mInputChannel) < 0) { + Log.w(TAG, "Failed to add window while updating wallpaper surface."); + return; + } mCreated = true; InputQueue.registerInputChannel(mInputChannel, mInputHandler, |