Snap for 6203188 from 776f223264d51915b64094c4f9e39c06d2112cea to qt-qpr3-release (be53de3e) · Commits · e / os / android_frameworks_opt_telephony

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

+11 −2

Original line number	Diff line number	Diff line
		@@ -63,6 +63,9 @@ public class CarrierServiceBindHelper {
		private String[] mLastSimState;
		private final PackageMonitor mPackageMonitor = new CarrierServicePackageMonitor();

		// whether we have successfully bound to the service
		private boolean mServiceBound = false;

		private BroadcastReceiver mUserUnlockedReceiver = new BroadcastReceiver() {
		@Override
		public void onReceive(Context context, Intent intent) {
		@@ -235,6 +238,7 @@ public class CarrierServiceBindHelper {
		if (mContext.bindServiceAsUser(carrierService, connection,
		Context.BIND_AUTO_CREATE \| Context.BIND_FOREGROUND_SERVICE,
		mHandler, Process.myUserHandle())) {
		mServiceBound = true;
		return;
		}

		@@ -289,8 +293,13 @@ public class CarrierServiceBindHelper {
		carrierServiceClass = null;

		// Actually unbind
		if (mServiceBound) {
		log("Unbinding from carrier app");
		mServiceBound = false;
		mContext.unbindService(connection);
		} else {
		log("Not bound, skipping unbindService call");
		}
		connection = null;
		mUnbindScheduledUptimeMillis = -1;
		}