commit ea2b5836f86a9fda6730e680f063370b9e3a1ef9
author Etan Cohen <etancohen@google.com> Thu Oct 23 18:50:35 2014 -0700
committer Etan Cohen <etancohen@google.com> Mon Oct 27 23:50:11 2014 +0000
tree e66180d6dca2f781215dbfd2b603cd5d8858fd0e
parent 16b3b36eb554d27f23b05577c6a76a9b989bdbcd

Separate VoLTE and VT configuration API.

Change-Id: I3647599c7f5c5f6f567428b3ce962f7162405cfa

src/java/com/android/ims/ImsManager.java

diff --git a/src/java/com/android/ims/ImsManager.java b/src/java/com/android/ims/ImsManager.java
index 1114ef2..3241e18 100644
--- a/src/java/com/android/ims/ImsManager.java
+++ b/src/java/com/android/ims/ImsManager.java
@@ -55,6 +55,8 @@
      */
     public static final String PROPERTY_DBG_VOLTE_AVAIL_OVERRIDE = "persist.dbg.volte_avail_ovr";
     public static final int PROPERTY_DBG_VOLTE_AVAIL_OVERRIDE_DEFAULT = 0;
+    public static final String PROPERTY_DBG_VT_AVAIL_OVERRIDE = "persist.dbg.vt_avail_ovr";
+    public static final int PROPERTY_DBG_VT_AVAIL_OVERRIDE_DEFAULT = 0;
 
     /**
      * For accessing the IMS related service.
@@ -172,9 +174,9 @@
     }
 
     /**
-     * Returns a platform configuration which may override the user setting.
+     * Returns a platform configuration for VoLTE which may override the user setting.
      */
-    public static boolean isEnhanced4gLteModeSettingEnabledByPlatform(Context context) {
+    public static boolean isVolteEnabledByPlatform(Context context) {
         if (SystemProperties.getInt(PROPERTY_DBG_VOLTE_AVAIL_OVERRIDE,
                 PROPERTY_DBG_VOLTE_AVAIL_OVERRIDE_DEFAULT) == 1) {
             return true;
@@ -187,7 +189,18 @@
                         com.android.internal.R.bool.config_carrier_volte_available);
     }
 
+    /**
+     * Returns a platform configuration for VT which may override the user setting.
+     *
+     * Note: VT presumes that VoLTE is enabled (these are configuration settings
+     * which must be done correctly).
+     */
     public static boolean isVtEnabledByPlatform(Context context) {
+        if (SystemProperties.getInt(PROPERTY_DBG_VT_AVAIL_OVERRIDE,
+                PROPERTY_DBG_VT_AVAIL_OVERRIDE_DEFAULT) == 1) {
+            return true;
+        }
+
         return
                 context.getResources().getBoolean(
                         com.android.internal.R.bool.config_device_vt_available) &&