Merge "Catch exception when unbinding" am: 814d22e11f (905c2bcf) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/CarrierServiceBindHelper.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -282,6 +282,7 @@ public class CarrierServiceBindHelper {
		Context.BIND_AUTO_CREATE \| Context.BIND_FOREGROUND_SERVICE,
		(r) -> mHandler.post(r),
		connection)) {
		log("service bound");
		mServiceBound = true;
		return;
		}
		@@ -340,7 +341,12 @@ public class CarrierServiceBindHelper {
		if (mServiceBound) {
		log("Unbinding from carrier app");
		mServiceBound = false;
		try {
		mContext.unbindService(connection);
		} catch (IllegalArgumentException e) {
		//TODO(b/151328766): Figure out why we unbind without binding
		loge("Tried to unbind without binding e=" + e);
		}
		} else {
		log("Not bound, skipping unbindService call");
		}