Merge "Combine isSatelliteEnabled and isSatelliteBeingEnabled" into main
diff --git a/src/com/android/services/telephony/DisconnectCauseUtil.java b/src/com/android/services/telephony/DisconnectCauseUtil.java
index 48786dc..e753e20 100644
--- a/src/com/android/services/telephony/DisconnectCauseUtil.java
+++ b/src/com/android/services/telephony/DisconnectCauseUtil.java
@@ -1046,7 +1046,7 @@
}
private static Integer getSatelliteErrorString() {
- if (SatelliteController.getInstance().isSatelliteEnabled()) {
+ if (SatelliteController.getInstance().isSatelliteEnabledOrBeingEnabled()) {
return R.string.incall_error_satellite_enabled;
}
return R.string.incall_error_carrier_roaming_satellite_mode;
diff --git a/src/com/android/services/telephony/TelephonyConnectionService.java b/src/com/android/services/telephony/TelephonyConnectionService.java
index 6a4ea3e..e7f91d4 100644
--- a/src/com/android/services/telephony/TelephonyConnectionService.java
+++ b/src/com/android/services/telephony/TelephonyConnectionService.java
@@ -1185,8 +1185,7 @@
boolean needToTurnOnRadio = (isEmergencyNumber && (!isRadioOn() || isAirplaneModeOn))
|| (isRadioPowerDownOnBluetooth() && !isPhoneWifiCallingEnabled);
- if (mSatelliteController.isSatelliteEnabled()
- || mSatelliteController.isSatelliteBeingEnabled()) {
+ if (mSatelliteController.isSatelliteEnabledOrBeingEnabled()) {
Log.d(this, "onCreateOutgoingConnection, "
+ " needToTurnOnRadio=" + needToTurnOnRadio
+ " needToTurnOffSatellite=" + needToTurnOffSatellite
@@ -1287,8 +1286,7 @@
// reporting the OUT_OF_SERVICE state.
return phone.getState() == PhoneConstants.State.OFFHOOK
|| (phone.getServiceStateTracker().isRadioOn()
- && (!mSatelliteController.isSatelliteEnabled()
- && !mSatelliteController.isSatelliteBeingEnabled()));
+ && !mSatelliteController.isSatelliteEnabledOrBeingEnabled());
} else {
SubscriptionInfoInternal subInfo = SubscriptionManagerService
.getInstance().getSubscriptionInfoInternal(phone.getSubId());
@@ -2152,8 +2150,7 @@
}
private boolean shouldExitSatelliteModeForEmergencyCall(boolean isEmergencyNumber) {
- if (!mSatelliteController.isSatelliteEnabled()
- && !mSatelliteController.isSatelliteBeingEnabled()) {
+ if (!mSatelliteController.isSatelliteEnabledOrBeingEnabled()) {
return false;
}
diff --git a/tests/src/com/android/services/telephony/TelephonyConnectionServiceTest.java b/tests/src/com/android/services/telephony/TelephonyConnectionServiceTest.java
index b6b1a36..a3497b6 100644
--- a/tests/src/com/android/services/telephony/TelephonyConnectionServiceTest.java
+++ b/tests/src/com/android/services/telephony/TelephonyConnectionServiceTest.java
@@ -1440,7 +1440,7 @@
@Test
@SmallTest
public void testCreateOutgoingEmergencyConnection_exitingSatellite_placeCall() {
- when(mSatelliteController.isSatelliteEnabled()).thenReturn(true);
+ when(mSatelliteController.isSatelliteEnabledOrBeingEnabled()).thenReturn(true);
doReturn(true).when(mMockResources).getBoolean(anyInt());
doReturn(true).when(mTelephonyManagerProxy).isCurrentEmergencyNumber(
anyString());
@@ -1456,7 +1456,7 @@
when(mSST.isRadioOn()).thenReturn(true);
assertFalse(callback.getValue()
.isOkToCall(testPhone, ServiceState.STATE_OUT_OF_SERVICE, false));
- when(mSatelliteController.isSatelliteEnabled()).thenReturn(false);
+ when(mSatelliteController.isSatelliteEnabledOrBeingEnabled()).thenReturn(false);
assertTrue(callback.getValue()
.isOkToCall(testPhone, ServiceState.STATE_OUT_OF_SERVICE, false));
@@ -1481,7 +1481,7 @@
public void testCreateOutgoingEmergencyConnection_exitingSatellite_EmergencySatellite()
throws Exception {
doReturn(true).when(mFeatureFlags).carrierRoamingNbIotNtn();
- doReturn(true).when(mSatelliteController).isSatelliteEnabled();
+ doReturn(true).when(mSatelliteController).isSatelliteEnabledOrBeingEnabled();
// Set config_turn_off_oem_enabled_satellite_during_emergency_call as false
doReturn(true).when(mTelephonyManagerProxy).isCurrentEmergencyNumber(anyString());
@@ -1500,7 +1500,7 @@
@SmallTest
public void testCreateOutgoingEmergencyConnection_exitingSatellite_OEM() throws Exception {
doReturn(true).when(mFeatureFlags).carrierRoamingNbIotNtn();
- doReturn(true).when(mSatelliteController).isSatelliteEnabled();
+ doReturn(true).when(mSatelliteController).isSatelliteEnabledOrBeingEnabled();
// Set config_turn_off_oem_enabled_satellite_during_emergency_call as false
doReturn(false).when(mMockResources).getBoolean(anyInt());
@@ -1539,7 +1539,7 @@
@SmallTest
public void testCreateOutgoingEmergencyConnection_exitingSatellite_Carrier() throws Exception {
doReturn(true).when(mFeatureFlags).carrierRoamingNbIotNtn();
- doReturn(true).when(mSatelliteController).isSatelliteEnabled();
+ doReturn(true).when(mSatelliteController).isSatelliteEnabledOrBeingEnabled();
// Set config_turn_off_oem_enabled_satellite_during_emergency_call as false
doReturn(false).when(mMockResources).getBoolean(anyInt());
@@ -3753,7 +3753,7 @@
@Test
public void testNormalCallSatelliteEnabled() {
setupForCallTest();
- doReturn(true).when(mSatelliteController).isSatelliteEnabled();
+ doReturn(true).when(mSatelliteController).isSatelliteEnabledOrBeingEnabled();
mConnection = mTestConnectionService.onCreateOutgoingConnection(PHONE_ACCOUNT_HANDLE_1,
createConnectionRequest(PHONE_ACCOUNT_HANDLE_1, "1234", TELECOM_CALL_ID1));
@@ -3766,7 +3766,7 @@
@Test
public void testEmergencyCallSatelliteEnabled_blockEmergencyCall() {
setupForCallTest();
- doReturn(true).when(mSatelliteController).isSatelliteEnabled();
+ doReturn(true).when(mSatelliteController).isSatelliteEnabledOrBeingEnabled();
doReturn(false).when(mMockResources).getBoolean(anyInt());
doReturn(true).when(mTelephonyManagerProxy).isCurrentEmergencyNumber(
anyString());