commit 6237f44d65b179b999f4931318967793a601386b
author Aishwarya Mallampati <amallampati@google.com> Thu Apr 24 23:08:11 2025 +0000
committer Aishwarya Mallampati <amallampati@google.com> Mon May 05 10:21:41 2025 -0700
tree f744b28d990ef0f4788ffdbf02db47afb92cb7f7
parent a5119916e7b3a63ff42b73560382a4768166769f

Remove unnecessary synchronized(mLock) blocks.

Bug: 409610090
Test: atest
Flag: com.android.internal.telephony.flags.satellite_improve_multi_thread_design
Change-Id: I655ed402d2653cde818d87a5095982c6bda9cebd

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

diff --git a/src/java/com/android/internal/telephony/satellite/DatagramDispatcher.java b/src/java/com/android/internal/telephony/satellite/DatagramDispatcher.java
index 4852e07..d9f0d72 100644
--- a/src/java/com/android/internal/telephony/satellite/DatagramDispatcher.java
+++ b/src/java/com/android/internal/telephony/satellite/DatagramDispatcher.java
@@ -268,17 +268,15 @@
                 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());
-                    } else {
-                        SatelliteModemInterface.getInstance().sendSatelliteDatagram(
-                                argument.datagram,
-                                SatelliteServiceUtils.isSosMessage(argument.datagramType),
-                                argument.needFullScreenPointingUI, onCompleted);
-                        startWaitForDatagramSendingResponseTimer(argument);
-                    }
+                if (mIsDemoMode.get() && !shouldSendDatagramToModemInDemoMode()) {
+                    AsyncResult.forMessage(onCompleted, SATELLITE_RESULT_SUCCESS, null);
+                    sendMessageDelayed(onCompleted, getDemoTimeoutDuration());
+                } else {
+                    SatelliteModemInterface.getInstance().sendSatelliteDatagram(
+                            argument.datagram,
+                            SatelliteServiceUtils.isSosMessage(argument.datagramType),
+                            argument.needFullScreenPointingUI, onCompleted);
+                    startWaitForDatagramSendingResponseTimer(argument);
                 }
                 break;
             }
@@ -837,37 +835,36 @@
     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) {
-                plogd("onSatelliteModemStateChanged: cleaning up resources");
-                cleanUpResources();
-            } else if (state == SatelliteManager.SATELLITE_MODEM_STATE_IDLE) {
+        mModemState.set(state);
+        if (state == SatelliteManager.SATELLITE_MODEM_STATE_OFF
+                || state == SatelliteManager.SATELLITE_MODEM_STATE_UNAVAILABLE) {
+            plogd("onSatelliteModemStateChanged: cleaning up resources");
+            cleanUpResources();
+        } else if (state == SatelliteManager.SATELLITE_MODEM_STATE_IDLE) {
+            sendPendingMessages();
+        }
+
+        if (state == SATELLITE_MODEM_STATE_CONNECTED) {
+            mHasEnteredConnectedState.set(true);
+
+            mConnectedStateCounter.incrementAndGet();
+            if (isFirstConnected()) {
+                mShouldPollMtSms.set(shouldPollMtSms());
+            }
+
+            if (isDatagramWaitForConnectedStateTimerStarted()) {
+                stopDatagramWaitForConnectedStateTimer();
                 sendPendingMessages();
             }
+        }
 
-            if (state == SATELLITE_MODEM_STATE_CONNECTED) {
-                mHasEnteredConnectedState.set(true);
-
-                mConnectedStateCounter.incrementAndGet();
-                if (isFirstConnected()) {
-                    mShouldPollMtSms.set(shouldPollMtSms());
-                }
-
-                if (isDatagramWaitForConnectedStateTimerStarted()) {
-                    stopDatagramWaitForConnectedStateTimer();
-                    sendPendingMessages();
-                }
-            }
-
-            if (state == SATELLITE_MODEM_STATE_NOT_CONNECTED) {
-                if (mHasEnteredConnectedState.get()) {
-                    mHasEnteredConnectedState.set(false);
-                    mShouldPollMtSms.set(shouldPollMtSms());
-                }
+        if (state == SATELLITE_MODEM_STATE_NOT_CONNECTED) {
+            if (mHasEnteredConnectedState.get()) {
+                mHasEnteredConnectedState.set(false);
+                mShouldPollMtSms.set(shouldPollMtSms());
             }
         }
+
         if (allowMtSmsPolling()) {
             sendMessage(obtainMessage(CMD_SEND_MT_SMS_POLLING_MESSAGE));
         }