Merge "Set Binder to null if linkToDeath throws RemoteException" (c9ba2b57) · Commits · e / os / frameworks_opt_net_ims

src/java/com/android/ims/FeatureConnection.java

+10 −3

Original line number	Diff line number	Diff line
		@@ -32,6 +32,8 @@ import android.util.Log;

		import com.android.internal.annotations.VisibleForTesting;

		import java.util.NoSuchElementException;

		/**
		* Base class of MmTelFeatureConnection and RcsFeatureConnection.
		*/
		@@ -79,7 +81,8 @@ public abstract class FeatureConnection {
		mBinder.linkToDeath(mDeathRecipient, 0);
		}
		} catch (RemoteException e) {
		// No need to do anything if the binder is already dead.
		Log.w(TAG, "setBinder: linkToDeath on already dead Binder, setting null");
		mBinder = null;
		}
		}
		}
		@@ -103,9 +106,13 @@ public abstract class FeatureConnection {
		synchronized (mLock) {
		if (mIsAvailable) {
		mIsAvailable = false;
		try {
		if (mBinder != null) {
		mBinder.unlinkToDeath(mDeathRecipient, 0);
		}
		} catch (NoSuchElementException e) {
		Log.w(TAG, "onRemovedOrDied: unlinkToDeath called on unlinked Binder.");
		}
		}
		}
		}