commit e941103f7a6dc6b290b26309ae9054981d541351
author Aishwarya Mallamapti <amallampati@google.com> Thu Jul 06 23:11:13 2023 +0000
committer Aishwarya Mallamapti <amallampati@google.com> Tue Jul 11 18:42:57 2023 +0000
tree b1e5b060609a01811f5ab27fe33256f8c4fe8d5d
parent d2318b6035715d3498bcb0e2a6ad54985b90e230

Block voice calls

Block non-emergency voice calls when device is using non-terrestrial network.

Bug: 287115020
Test: Flashed device on raven-userdebug and performed basic
functionality tests,
atest TelephonyConnectionServiceTest

Change-Id: Ic06f5a7c3917f84894130aed4d98b3564d3a7018

src/com/android/services/telephony/TelephonyConnectionService.java

diff --git a/src/com/android/services/telephony/TelephonyConnectionService.java b/src/com/android/services/telephony/TelephonyConnectionService.java
index 3e61f57..5448f9c 100644
--- a/src/com/android/services/telephony/TelephonyConnectionService.java
+++ b/src/com/android/services/telephony/TelephonyConnectionService.java
@@ -1173,7 +1173,11 @@
             }
 
             if (!isEmergencyNumber) {
-                if (mSatelliteController.isSatelliteEnabled()) {
+                ServiceState serviceState = phone != null ? phone.getServiceState() : null;
+                if (mSatelliteController.isSatelliteEnabled()
+                        || (serviceState != null && serviceState.isUsingNonTerrestrialNetwork())) {
+                    // TODO: Disconnect call when connected to satellite based on device config or
+                    //  carrier config.
                     Log.d(this, "onCreateOutgoingConnection, cannot make call in satellite mode.");
                     return Connection.createFailedConnection(
                             mDisconnectCauseFactory.toTelecomDisconnectCause(

tests/src/com/android/services/telephony/TelephonyConnectionServiceTest.java

diff --git a/tests/src/com/android/services/telephony/TelephonyConnectionServiceTest.java b/tests/src/com/android/services/telephony/TelephonyConnectionServiceTest.java
index 3831cd2..c486735 100644
--- a/tests/src/com/android/services/telephony/TelephonyConnectionServiceTest.java
+++ b/tests/src/com/android/services/telephony/TelephonyConnectionServiceTest.java
@@ -2965,6 +2965,22 @@
                 disconnectCause.getTelephonyDisconnectCause());
     }
 
+    @Test
+    public void testNormalCallUsingNonTerrestrialNetwork() {
+        setupForCallTest();
+        NetworkRegistrationInfo nri = new NetworkRegistrationInfo.Builder()
+                .setIsNonTerrestrialNetwork(true)
+                .build();
+        ServiceState ss = new ServiceState();
+        ss.addNetworkRegistrationInfo(nri);
+        when(mPhone0.getServiceState()).thenReturn(ss);
+        mConnection = mTestConnectionService.onCreateOutgoingConnection(PHONE_ACCOUNT_HANDLE_1,
+                createConnectionRequest(PHONE_ACCOUNT_HANDLE_1, "1234", TELECOM_CALL_ID1));
+        DisconnectCause disconnectCause = mConnection.getDisconnectCause();
+        assertEquals(android.telephony.DisconnectCause.SATELLITE_ENABLED,
+                disconnectCause.getTelephonyDisconnectCause());
+    }
+
     private void setupForDialForDomainSelection(Phone mockPhone, int domain, boolean isEmergency) {
         if (isEmergency) {
             doReturn(mEmergencyCallDomainSelectionConnection).when(mDomainSelectionResolver)