Snap for 12406339 from 57cf8b65c7cd505fafe29022843e3718835a49b3 to 24Q4-release (25b1b533) · Commits · e / os / android_frameworks_opt_telephony

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

+5 −2

Original line number	Diff line number	Diff line
		@@ -259,6 +259,7 @@ public class SatelliteSOSMessageRecommender extends Handler {
		}

		private void handleEmergencyCallStartedEvent(@NonNull Connection connection) {
		plogd("handleEmergencyCallStartedEvent: connection=" + connection);
		mSatelliteController.setLastEmergencyCallTime();

		if (sendEventDisplayEmergencyMessageForcefully(connection)) {
		@@ -414,6 +415,7 @@ public class SatelliteSOSMessageRecommender extends Handler {
		}

		private void cleanUpResources() {
		plogd("cleanUpResources");
		synchronized (mLock) {
		stopTimer();
		if (mEmergencyConnection != null) {
		@@ -501,7 +503,8 @@ public class SatelliteSOSMessageRecommender extends Handler {
		if (!SatelliteServiceUtils.isCellularAvailable() && mEmergencyConnection != null) {
		startTimer();
		} else {
		logv("handleStateChangedEventForHysteresisTimer stopTimer");
		plogd("handleStateChangedEventForHysteresisTimer stopTimer, mEmergencyConnection="
		+ mEmergencyConnection);
		stopTimer();
		}
		}
		@@ -514,7 +517,7 @@ public class SatelliteSOSMessageRecommender extends Handler {
		sendMessageDelayed(obtainMessage(EVENT_TIME_OUT), mTimeoutMillis);
		mCountOfTimerStarted++;
		mIsTimerTimedOut = false;
		logd("startTimer mCountOfTimerStarted=" + mCountOfTimerStarted);
		plogd("startTimer mCountOfTimerStarted=" + mCountOfTimerStarted);
		}
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -481,12 +481,12 @@ public class SatelliteServiceUtils {
		if ((state == STATE_IN_SERVICE \|\| state == STATE_EMERGENCY_ONLY
		\|\| serviceState.isEmergencyOnly())
		&& !isSatellitePlmn(phone.getSubId(), serviceState)) {
		logv("isCellularAvailable true");
		logd("isCellularAvailable true");
		return true;
		}
		}
		}
		logv("isCellularAvailable false");
		logd("isCellularAvailable false");
		return false;
		}