Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev
diff --git a/src/com/android/phone/satellite/accesscontrol/SatelliteAccessController.java b/src/com/android/phone/satellite/accesscontrol/SatelliteAccessController.java
index b7e3413..ef919ef 100644
--- a/src/com/android/phone/satellite/accesscontrol/SatelliteAccessController.java
+++ b/src/com/android/phone/satellite/accesscontrol/SatelliteAccessController.java
@@ -1021,6 +1021,8 @@
mLocationRequestCancellationSignal = null;
Bundle bundle = new Bundle();
if (location != null) {
+ plogd("onCurrentLocationAvailable: lat=" + Rlog.pii(TAG, location.getLatitude())
+ + ", long=" + Rlog.pii(TAG, location.getLongitude()));
if (location.isMock() && !isMockModemAllowed()) {
logd("location is mock");
bundle.putBoolean(KEY_SATELLITE_COMMUNICATION_ALLOWED, false);
@@ -1180,14 +1182,23 @@
private boolean isInEmergency() {
// Check if emergency call is ongoing
if (mTelecomManager.isInEmergencyCall()) {
+ plogd("In emergency call");
return true;
}
+
// Check if the device is in emergency callback mode
for (Phone phone : PhoneFactory.getPhones()) {
if (phone.isInEcm()) {
+ plogd("In emergency callback mode");
return true;
}
}
+
+ // Check if satellite is in emergency mode
+ if (mSatelliteController.isInEmergencyMode()) {
+ plogd("In satellite emergency mode");
+ return true;
+ }
return false;
}