summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2017-07-07 01:34:17 (GMT)
committerandroid-build-team Robot <android-build-team-robot@google.com>2017-07-07 01:34:17 (GMT)
commit56b7d44c211f7bf7623dc7b3f66d7f8d8c840fa1 (patch)
tree28c52dbf554491f88981694bcc963e0e36813dfb
parentad704f7ec2466125431c97b50ad8839175e9407b (diff)
parent2fecb6b4c275c634fa87e1e4fb33804757009493 (diff)
downloadandroid_packages_wallpapers_LivePicker-staging/lineage-15.0_rebase-android-8.0.0_r23.zip
android_packages_wallpapers_LivePicker-staging/lineage-15.0_rebase-android-8.0.0_r23.tar.gz
android_packages_wallpapers_LivePicker-staging/lineage-15.0_rebase-android-8.0.0_r23.tar.bz2
Merge cherrypicks of [2504334, 2504429, 2504277, 2504391, 2505083, 2505102, 2505048, 2505084] into oc-dr1-releasestaging/lineage-15.0_rebase-android-8.0.0_r23
Change-Id: If953fa9f52fccc40e90c7f667873b11260d54152
-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;
}