Snap for 12406339 from 57cf8b65c7cd505fafe29022843e3718835a49b3 to 24Q4-release
Change-Id: Id89ef38f732b2640bb82c9d7c6ac2f10e36bd07d
diff --git a/src/java/com/android/internal/telephony/satellite/SatelliteSOSMessageRecommender.java b/src/java/com/android/internal/telephony/satellite/SatelliteSOSMessageRecommender.java
index d42a410..0bf8184 100644
--- a/src/java/com/android/internal/telephony/satellite/SatelliteSOSMessageRecommender.java
+++ b/src/java/com/android/internal/telephony/satellite/SatelliteSOSMessageRecommender.java
@@ -259,6 +259,7 @@
}
private void handleEmergencyCallStartedEvent(@NonNull Connection connection) {
+ plogd("handleEmergencyCallStartedEvent: connection=" + connection);
mSatelliteController.setLastEmergencyCallTime();
if (sendEventDisplayEmergencyMessageForcefully(connection)) {
@@ -414,6 +415,7 @@
}
private void cleanUpResources() {
+ plogd("cleanUpResources");
synchronized (mLock) {
stopTimer();
if (mEmergencyConnection != null) {
@@ -501,7 +503,8 @@
if (!SatelliteServiceUtils.isCellularAvailable() && mEmergencyConnection != null) {
startTimer();
} else {
- logv("handleStateChangedEventForHysteresisTimer stopTimer");
+ plogd("handleStateChangedEventForHysteresisTimer stopTimer, mEmergencyConnection="
+ + mEmergencyConnection);
stopTimer();
}
}
@@ -514,7 +517,7 @@
sendMessageDelayed(obtainMessage(EVENT_TIME_OUT), mTimeoutMillis);
mCountOfTimerStarted++;
mIsTimerTimedOut = false;
- logd("startTimer mCountOfTimerStarted=" + mCountOfTimerStarted);
+ plogd("startTimer mCountOfTimerStarted=" + mCountOfTimerStarted);
}
}
diff --git a/src/java/com/android/internal/telephony/satellite/SatelliteServiceUtils.java b/src/java/com/android/internal/telephony/satellite/SatelliteServiceUtils.java
index 21c5c44..3936a7e 100644
--- a/src/java/com/android/internal/telephony/satellite/SatelliteServiceUtils.java
+++ b/src/java/com/android/internal/telephony/satellite/SatelliteServiceUtils.java
@@ -481,12 +481,12 @@
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;
}