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

Commit af5c6e4c authored by Tobias Lindskog's avatar Tobias Lindskog Committed by android-build-merger
Browse files

Merge "Catch double unbind of dead service" am: 03cdc95f am: e0d33bc3 

am: 7bccbef7

Change-Id: Id2616eeff45b7da2eeda0fe83d41dff2db99366a
parents 9b7feec9 7bccbef7

services/core/java/com/android/server/notification/ManagedServices.java

+5 −1
Original line number Diff line number Diff line
@@ -931,7 +931,11 @@ abstract public class ManagedServices { 
                Slog.v(TAG, "    disconnecting old " + getCaption() + ": " + info.service);

                removeServiceLocked(i);

                if (info.connection != null) {

                    try {

                        mContext.unbindService(info.connection);

                    } catch (IllegalArgumentException e) {

                        Slog.e(TAG, "failed to unbind " + name, e);

                    }

                }

            }

        }