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

Change-Id: If26cfa6252be02579476b9426c4c100c6066c473
2020-04-30 14:36:58 +00:00
parent 6266b41e07 06e29c96fc
commit 16d2cb7433
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);
+                }
            }
        }