summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLucas Dupin <dupin@google.com>2017-07-06 22:06:58 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-07-06 22:06:58 +0000
commit1c54b5d6bfa3ecd18e7210bebd994799a6dff902 (patch)
tree28c52dbf554491f88981694bcc963e0e36813dfb
parent8cb186859f3d9f39c9dfec4bb560179636f301f9 (diff)
parentb989a5e9de2d0300c578e79705f670c2b7ffe199 (diff)
downloadandroid_packages_wallpapers_LivePicker-1c54b5d6bfa3ecd18e7210bebd994799a6dff902.tar.gz
android_packages_wallpapers_LivePicker-1c54b5d6bfa3ecd18e7210bebd994799a6dff902.tar.bz2
android_packages_wallpapers_LivePicker-1c54b5d6bfa3ecd18e7210bebd994799a6dff902.zip
Avoid crash when unbinding wallpaper
am: b989a5e9de Change-Id: I844a5825b8f72127b98cac7ac733e988f276ed00
-rw-r--r--src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java b/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java
index baaa13c..6dab5c6 100644
--- a/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java
+++ b/src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java
@@ -439,7 +439,12 @@ public class LiveWallpaperPreview extends Activity {
}
mEngine = null;
}
- unbindService(this);
+ try {
+ unbindService(this);
+ } catch (IllegalArgumentException e) {
+ Log.w(LOG_TAG, "Can't unbind wallpaper service. "
+ + "It might have crashed, just ignoring.", e);
+ }
mService = null;
}
}
@@ -485,7 +490,7 @@ public class LiveWallpaperPreview extends Activity {
}
}
}
-
+
public ParcelFileDescriptor setWallpaper(String name) {
return null;
}