Snap for 12715656 from 5b73a08409d27a3b106fa90b935b2707723d74d5 to 25Q1-release (1f6d7d36) · Commits · e / os / android_frameworks_opt_telephony

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

+25 −2

Original line number	Diff line number	Diff line
		@@ -657,6 +657,11 @@ public class SatelliteController extends Handler {
		private final Object mNtnSmsSupportedByMessagesAppLock = new Object();
		@GuardedBy("mNtnSmsSupportedByMessagesAppLock")
		private Boolean mNtnSmsSupportedByMessagesApp = null;

		private final Object mSatelliteModemStateLock = new Object();
		@GuardedBy("mSatelliteModemStateLock")
		@SatelliteManager.SatelliteModemState
		private int mSatelliteModemState = SatelliteManager.SATELLITE_MODEM_STATE_UNKNOWN;
		private BroadcastReceiver
		mDefaultSmsSubscriptionChangedBroadcastReceiver = new BroadcastReceiver() {
		@Override
		@@ -4771,6 +4776,11 @@ public class SatelliteController extends Handler {
		private void handleEventSatelliteModemStateChanged(
		@SatelliteManager.SatelliteModemState int state) {
		plogd("handleEventSatelliteModemStateChanged: state=" + state);

		synchronized (mSatelliteModemStateLock) {
		mSatelliteModemState = state;
		}

		if (state == SatelliteManager.SATELLITE_MODEM_STATE_UNAVAILABLE
		\|\| state == SatelliteManager.SATELLITE_MODEM_STATE_OFF) {
		if (!isWaitingForDisableSatelliteModemResponse()) {
		@@ -8093,8 +8103,7 @@ public class SatelliteController extends Handler {
		NTN_SIGNAL_STRENGTH_NONE);

		if (isInCarrierRoamingNbIotNtn(phone)) {
		if (mSatelliteSessionController != null
		&& mSatelliteSessionController.isInConnectedState()) {
		if (isInConnectedState()) {
		synchronized (mNtnSignalsStrengthLock) {
		carrierRoamingNtnSignalStrength = mNtnSignalStrength;
		}
		@@ -8114,6 +8123,20 @@ public class SatelliteController extends Handler {
		return carrierRoamingNtnSignalStrength;
		}

		private boolean isInConnectedState() {
		synchronized (mSatelliteModemStateLock) {
		switch (mSatelliteModemState) {
		case SatelliteManager.SATELLITE_MODEM_STATE_CONNECTED:
		case SatelliteManager.SATELLITE_MODEM_STATE_DATAGRAM_TRANSFERRING:
		plogd("isInConnectedState: return true");
		return true;
		default:
		plogd("isInConnectedState: return false");
		return false;
		}
		}
		}

		protected void updateLastNotifiedCarrierRoamingNtnSignalStrengthAndNotify(
		@Nullable Phone phone) {
		if (!mFeatureFlags.carrierRoamingNbIotNtn()) return;

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

+0 −23

Original line number	Diff line number	Diff line
		@@ -584,29 +584,6 @@ public class SatelliteSessionController extends StateMachine {
		return getCurrentState() == mDisablingState;
		}

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

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


		/**
		* Release all resource.
		*/