Merge "Import translations. DO NOT MERGE ANYWHERE" into main
diff --git a/src/com/android/server/telecom/CreateConnectionTimeout.java b/src/com/android/server/telecom/CreateConnectionTimeout.java
index 3046ca4..2889e13 100644
--- a/src/com/android/server/telecom/CreateConnectionTimeout.java
+++ b/src/com/android/server/telecom/CreateConnectionTimeout.java
@@ -16,8 +16,6 @@
package com.android.server.telecom;
-import static com.android.internal.telephony.flags.Flags.carrierEnabledSatelliteFlag;
-
import android.content.Context;
import android.os.Handler;
import android.os.Looper;
@@ -117,11 +115,6 @@
@Override
public void loggedRun() {
- if (!carrierEnabledSatelliteFlag()) {
- timeoutCallIfNeeded();
- return;
- }
-
PhoneAccountHandle connectionManager =
mPhoneAccountRegistrar.getSimCallManagerFromCall(mCall);
if (connectionManager != null) {
diff --git a/tests/src/com/android/server/telecom/tests/CreateConnectionProcessorTest.java b/tests/src/com/android/server/telecom/tests/CreateConnectionProcessorTest.java
index e497f48..475133c 100644
--- a/tests/src/com/android/server/telecom/tests/CreateConnectionProcessorTest.java
+++ b/tests/src/com/android/server/telecom/tests/CreateConnectionProcessorTest.java
@@ -162,8 +162,6 @@
mTestCreateConnectionTimeout = new CreateConnectionTimeout(mContext, mMockAccountRegistrar,
makeConnectionServiceWrapper(), mMockCall, mTimeoutsAdapter);
-
- mSetFlagsRule.enableFlags(Flags.FLAG_CARRIER_ENABLED_SATELLITE_FLAG);
}
@Override
@@ -1127,4 +1125,4 @@
.setIsEnabled(true)
.build();
}
-}
\ No newline at end of file
+}