diff options
author | Lucas Dupin <dupin@google.com> | 2017-07-06 22:34:40 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-07-06 22:34:40 +0000 |
commit | 00c19051c119f730c28dceeee0893354d52aa7f3 (patch) | |
tree | 28c52dbf554491f88981694bcc963e0e36813dfb | |
parent | db162ddd0ff5beaf05cd98198c7cf3a5f24f5d42 (diff) | |
parent | 1c54b5d6bfa3ecd18e7210bebd994799a6dff902 (diff) | |
download | android_packages_wallpapers_LivePicker-00c19051c119f730c28dceeee0893354d52aa7f3.tar.gz android_packages_wallpapers_LivePicker-00c19051c119f730c28dceeee0893354d52aa7f3.tar.bz2 android_packages_wallpapers_LivePicker-00c19051c119f730c28dceeee0893354d52aa7f3.zip |
Avoid crash when unbinding wallpaper am: b989a5e9de
am: 1c54b5d6bf
Change-Id: Ib05d5e2d592fb645d03b393f311004d26fff6262
-rw-r--r-- | src/com/android/wallpaper/livepicker/LiveWallpaperPreview.java | 9 |
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; } |