Merge "CarrierServiceBindHelper: context mismatch in bindService vs unbindservice" (5b78b2ff) · Commits · e / os / android_frameworks_opt_telephony

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

+7 −12

Original line number	Diff line number	Diff line
		@@ -128,7 +128,7 @@ public class CarrierServiceBindHelper {
		};

		public CarrierServiceBindHelper(Context context) {
		mContext = context;
		mContext = context.createContextAsUser(Process.myUserHandle(), 0);

		updateBindingsAndSimStates();

		@@ -283,8 +283,8 @@ public class CarrierServiceBindHelper {

		String error;
		try {
		if (mContext.createContextAsUser(Process.myUserHandle(), 0)
		.bindService(carrierService,
		if (mContext.bindService(
		carrierService,
		Context.BIND_AUTO_CREATE
		\| Context.BIND_FOREGROUND_SERVICE
		\| Context.BIND_INCLUDE_CAPABILITIES,
		@@ -350,12 +350,7 @@ public class CarrierServiceBindHelper {
		if (mServiceBound) {
		logdWithLocalLog("Unbinding from carrier app");
		mServiceBound = false;
		try {
		mContext.unbindService(connection);
		} catch (IllegalArgumentException e) {
		//TODO(b/151328766): Figure out why we unbind without binding
		logeWithLocalLog("Tried to unbind without binding e=" + e);
		}
		} else {
		logdWithLocalLog("Not bound, skipping unbindService call");
		}