Merge "Remove unnecessary synchronized(mLock) blocks." into main (981fc3de) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/satellite/DatagramDispatcher.java

+32 −35

Original line number	Diff line number	Diff line
		@@ -268,7 +268,6 @@ public class DatagramDispatcher extends Handler {
		argument.setDatagramStartTime();
		onCompleted = obtainMessage(EVENT_SEND_SATELLITE_DATAGRAM_DONE, request);

		synchronized (mLock) {
		if (mIsDemoMode.get() && !shouldSendDatagramToModemInDemoMode()) {
		AsyncResult.forMessage(onCompleted, SATELLITE_RESULT_SUCCESS, null);
		sendMessageDelayed(onCompleted, getDemoTimeoutDuration());
		@@ -279,7 +278,6 @@ public class DatagramDispatcher extends Handler {
		argument.needFullScreenPointingUI, onCompleted);
		startWaitForDatagramSendingResponseTimer(argument);
		}
		}
		break;
		}
		case EVENT_SEND_SATELLITE_DATAGRAM_DONE: {
		@@ -837,7 +835,6 @@ public class DatagramDispatcher extends Handler {
		private void handleEventSatelliteModemStateChanged(
		@SatelliteManager.SatelliteModemState int state) {
		plogd("handleEventSatelliteModemStateChanged: state = " + state);
		synchronized (mLock) {
		mModemState.set(state);
		if (state == SatelliteManager.SATELLITE_MODEM_STATE_OFF
		\|\| state == SatelliteManager.SATELLITE_MODEM_STATE_UNAVAILABLE) {
		@@ -867,7 +864,7 @@ public class DatagramDispatcher extends Handler {
		mShouldPollMtSms.set(shouldPollMtSms());
		}
		}
		}

		if (allowMtSmsPolling()) {
		sendMessage(obtainMessage(CMD_SEND_MT_SMS_POLLING_MESSAGE));
		}