Merge "Ignore exception if already unbound from service" into main (ea6b298c) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/InstantAppResolverConnection.java

+6 −1

Original line number	Original line	Diff line number	Diff line
	@@ -212,7 +212,12 @@ final class InstantAppResolverConnection implements DeathRecipient {
	if (DEBUG_INSTANT) {		if (DEBUG_INSTANT) {
	Slog.i(TAG, "[" + token + "] Previous connection never established; rebinding");		Slog.i(TAG, "[" + token + "] Previous connection never established; rebinding");
	}		}
			try {
	mContext.unbindService(mServiceConnection);		mContext.unbindService(mServiceConnection);
			} catch (Exception e) {
			Slog.e(TAG, "[" + token + "] Service already unbound", e);
			}

	}		}
	if (DEBUG_INSTANT) {		if (DEBUG_INSTANT) {
	Slog.v(TAG, "[" + token + "] Binding to instant app resolver");		Slog.v(TAG, "[" + token + "] Binding to instant app resolver");