Merge "Update ntn signal level when device is in transferring state also." into main (9a1ed7c3) · Commits · e / os / android_frameworks_opt_telephony

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -8093,7 +8093,8 @@ public class SatelliteController extends Handler {
		NTN_SIGNAL_STRENGTH_NONE);

		if (isInCarrierRoamingNbIotNtn(phone)) {
		if (mSatelliteSessionController.isInConnectedState()) {
		if (mSatelliteSessionController != null
		&& mSatelliteSessionController.isInConnectedState()) {
		synchronized (mNtnSignalsStrengthLock) {
		carrierRoamingNtnSignalStrength = mNtnSignalStrength;
		}

+15 −4

Original line number	Diff line number	Diff line
		@@ -68,7 +68,6 @@ import android.text.TextUtils;
		import android.util.Log;

		import com.android.internal.R;
		import com.android.internal.annotations.GuardedBy;
		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.telephony.DeviceStateMonitor;
		import com.android.internal.telephony.ExponentialBackoff;
		@@ -586,13 +585,25 @@ public class SatelliteSessionController extends StateMachine {
		}

		/**
		* Get whether state machine is in connected state.
		* Get whether device is connected to satellite.
		*
		* @return {@code true} if state machine is in connected state and {@code false} otherwise.
		* @return {@code true} if device is connected to satellite else return {@code false}.
		*/
		public boolean isInConnectedState() {
		if (DBG) plogd("isInConnectedState: getCurrentState=" + getCurrentState());
		return getCurrentState() == mConnectedState;
		if (getCurrentState() == null) {
		return false;
		}

		switch (getCurrentState().getName()) {
		case "ConnectedState":
		case "TransferringState":
		return true;
		case "IdleState":
		return isConcurrentTnScanningSupported();
		default:
		return false;
		}
		}