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

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;
         }