Merge "Handle Context#unbindService exception" into rvc-dev am: 06e29c96fc am: f6a9b17276

Change-Id: Idfc8a705b13dce4a5faba2c7a7d8c673aed03dad
2020-04-30 14:50:41 +00:00
parent 120c1b1ad6 f6a9b17276
commit c48cfa6264
1 changed files with 7 additions and 1 deletions
--- a/services/core/java/com/android/server/storage/StorageUserConnection.java
+++ b/services/core/java/com/android/server/storage/StorageUserConnection.java
@@ -242,7 +242,13 @@ public final class StorageUserConnection {
            }

            if (oldConnection != null) {
-                mContext.unbindService(oldConnection);
+                try {
+                    mContext.unbindService(oldConnection);
+                } catch (Exception e) {
+                    // Handle IllegalArgumentException that may be thrown if the user is already
+                    // stopped when we try to unbind
+                    Slog.w(TAG, "Failed to unbind service", e);
+                }
            }
        }