Commit 00c7393a authored Mar 12, 2018 by Tobias Lindskog Committed by Henrik Baard Apr 20, 2018

Catch double unbind of dead service

If a service receives onBindingDied after it has successfully connected
once, unbindService would be called once from the onBindingDied and then
again from registerServiceLocked when the service was rebound.  This
second attempt would typically crash.

The first unbindService call has a try/catch, add one around the second
call as well.

Test: Manual.  Boots and reboots without problems.
Change-Id: Ie9eabbcb6ee89c05abc565427465cfd6906f3fa3

parent 5a533ae4

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

+5 −1

Original line number	Diff line number	Diff line
		@@ -844,7 +844,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);
		}
		}
		}
		}