commit 60d0153d06c4e703e5547ccae613193336dd7cf8
author Brad Ebinger <breadley@google.com> Fri Feb 15 17:30:07 2019 +0000
committer Brad Ebinger <breadley@google.com> Fri Feb 15 17:30:07 2019 +0000
tree 02fd83b1bee450ae7f9eba3968c308b9d39b2b1b
parent 82e0040a934183ca4977c04100bc817a7b162ffb

Revert "MMTEL Compat: Remove VT flag when VT+VoLTE are enabled"

This reverts commit 82e0040a934183ca4977c04100bc817a7b162ffb.

Reason for revert: Moving to vendor specific code.

Change-Id: I750e354177c5658581a16f5d03ca6c1785256cdb

src/java/com/android/internal/telephony/ims/MmTelFeatureCompatAdapter.java

diff --git a/src/java/com/android/internal/telephony/ims/MmTelFeatureCompatAdapter.java b/src/java/com/android/internal/telephony/ims/MmTelFeatureCompatAdapter.java
index db742be..7b0619b 100644
--- a/src/java/com/android/internal/telephony/ims/MmTelFeatureCompatAdapter.java
+++ b/src/java/com/android/internal/telephony/ims/MmTelFeatureCompatAdapter.java
@@ -42,7 +42,6 @@
 import com.android.ims.internal.IImsUt;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
@@ -81,15 +80,6 @@
     public static final int FEATURE_DISABLED = 0;
     public static final int FEATURE_ENABLED = 1;
 
-    private static final CapabilityChangeRequest.CapabilityPair VOLTE_CAPABILITY_PAIR =
-            new CapabilityChangeRequest.CapabilityPair(
-                    MmTelCapabilities.CAPABILITY_TYPE_VOICE,
-                    ImsRegistrationImplBase.REGISTRATION_TECH_LTE);
-    private static final CapabilityChangeRequest.CapabilityPair VT_CAPABILITY_PAIR =
-            new CapabilityChangeRequest.CapabilityPair(
-                    MmTelCapabilities.CAPABILITY_TYPE_VIDEO,
-                    ImsRegistrationImplBase.REGISTRATION_TECH_LTE);
-
     private static class ConfigListener extends ImsConfigListener.Stub {
 
         private final int mCapability;
@@ -358,20 +348,6 @@
                         });
                 latch.await(WAIT_TIMEOUT_MS, TimeUnit.MILLISECONDS);
             }
-            // Hack For compatibility purposes: older implementations would ignore the VT feature
-            // enabled flag when VoLTE was also enabled on the first time after sub loaded. If we
-            // did not ignore the VT feature, it would send multiple registrations to the network
-            // (first voice, then voice+video). So, we should only send voice if voice+vt is enabled
-            // because they will check to see if VT is enabled separately.
-            List<CapabilityChangeRequest.CapabilityPair> enableRequest =
-                    request.getCapabilitiesToEnable();
-            if (enableRequest.contains(VT_CAPABILITY_PAIR)
-                    && enableRequest.contains(VOLTE_CAPABILITY_PAIR)) {
-                Log.i(TAG, "changeEnabledCapabilities: VT + VoLTE enable requested - removing VT "
-                        + "request");
-                enableRequest.remove(VT_CAPABILITY_PAIR);
-            }
-
             // Enable Capabilities
             for (CapabilityChangeRequest.CapabilityPair cap : request.getCapabilitiesToEnable()) {
                 CountDownLatch latch = new CountDownLatch(1);