Merge "ignore exception calling unlinkToDeath" into oc-dev (79777a5b) · Commits · e / os / android_frameworks_base

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

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -43,6 +43,7 @@ import java.io.IOException;
	import java.io.PrintWriter;		import java.io.PrintWriter;
	import java.util.ArrayList;		import java.util.ArrayList;
	import java.util.List;		import java.util.List;
			import java.util.NoSuchElementException;
	import java.util.concurrent.TimeoutException;		import java.util.concurrent.TimeoutException;

	/**		/**
	@@ -206,7 +207,9 @@ final class EphemeralResolverConnection implements DeathRecipient {

	private void handleBinderDiedLocked() {		private void handleBinderDiedLocked() {
	if (mRemoteInstance != null) {		if (mRemoteInstance != null) {
			try {
	mRemoteInstance.asBinder().unlinkToDeath(this, 0 /flags/);		mRemoteInstance.asBinder().unlinkToDeath(this, 0 /flags/);
			} catch (NoSuchElementException ignore) { }
	}		}
	mRemoteInstance = null;		mRemoteInstance = null;
	}		}