Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16d2cb74 authored by Zimuzo Ezeozue's avatar Zimuzo Ezeozue Committed by Automerger Merge Worker
Browse files

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

Change-Id: If26cfa6252be02579476b9426c4c100c6066c473
parents 6266b41e 06e29c96

services/core/java/com/android/server/storage/StorageUserConnection.java

+7 −1
Original line number Original line Diff line number Diff line
@@ -242,7 +242,13 @@ public final class StorageUserConnection { 
            }

            }





            if (oldConnection != null) {

            if (oldConnection != null) {

                try {

                    mContext.unbindService(oldConnection);

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

                }

            }

            }

        }

        }