Gracefully handle unbind errors when detaching

When detaching from a previous wallpaper we unbind our connection from
the underlying service. This can generate an exception if the service is
no longer available and lead to the wallpaper state being left in a
half-cleared state as well as causing the detach operation to fail. This
CL adds a catch to handle the exception, in this case it doesn't matter
if the the service has gone away since we're detaching from it anyway.

Bug: 296508731
Test: atest WallpaperManagerTest
Change-Id: I19a3fedecafca10744cf21f2e6bd40c9f8f6350a

1 files changed, 5 insertions, 1 deletions

diff --git a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
index 00992a03634d..4c525e902b88 100644
--- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
+++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
@@ -3749,7 +3749,11 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
             mContext.getMainThreadHandler().removeCallbacks(
                     wallpaper.connection.mTryToRebindRunnable);
 
-            mContext.unbindService(wallpaper.connection);
+            try {
+                mContext.unbindService(wallpaper.connection);
+            } catch (IllegalArgumentException e) {
+                Slog.w(TAG, "Error unbinding wallpaper when detaching", e);
+            }
             wallpaper.connection = null;
             if (wallpaper == mLastWallpaper) {
                 mLastWallpaper = null;