Snap for 7085329 from 5970b0c1dbfe13bac7ad098b3fed4d095c26f672 to rvc-qpr3-release (a0a24a7c) · Commits · e / os / frameworks_opt_net_ims

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

+10 −3

Original line number	Diff line number	Diff line
		@@ -34,6 +34,8 @@ import com.android.internal.telephony.util.HandlerExecutor;

		import java.util.concurrent.Executor;

		import java.util.NoSuchElementException;

		/**
		* Base class of MmTelFeatureConnection and RcsFeatureConnection.
		*/
		@@ -102,7 +104,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;
		}
		}
		}
		@@ -127,9 +130,13 @@ public abstract class FeatureConnection {
		if (mIsAvailable) {
		mIsAvailable = false;
		mRegistrationBinder = null;
		try {
		if (mBinder != null) {
		mBinder.unlinkToDeath(mDeathRecipient, 0);
		}
		} catch (NoSuchElementException e) {
		Log.w(TAG, "onRemovedOrDied: unlinkToDeath called on unlinked Binder.");
		}
		if (mStatusCallback != null) {
		Log.d(TAG, "onRemovedOrDied: notifyUnavailable");
		mStatusCallback.notifyUnavailable();