commit 4effdca336ead475a90ac1529ff4007f7218dfd7
author Pankaj Kanwar <pkanwar@google.com> Fri Jul 15 15:10:26 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 15 15:10:27 2016 +0000
tree 3c30ab7467b9eae6c6b1d2558743508f8230a490
parent 643ffe48f018739aa13d4e3d38794103919d168c
parent 8ae5fbb8c970ec7546762f89ed33eec37c4912c4

Merge "Workaround for incorrect EXTRA_CALL_RAT_TYPE in vendor code." into nyc-mr1-dev

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 0b5de7e..c7c2db2 100644
--- a/src/java/com/android/ims/ImsManager.java
+++ b/src/java/com/android/ims/ImsManager.java
@@ -36,7 +36,6 @@
 
 import com.android.ims.internal.IImsCallSession;
 import com.android.ims.internal.IImsEcbm;
-import com.android.ims.internal.IImsEcbmListener;
 import com.android.ims.internal.IImsMultiEndpoint;
 import com.android.ims.internal.IImsRegistrationListener;
 import com.android.ims.internal.IImsService;
@@ -47,6 +46,7 @@
 import java.io.FileDescriptor;
 import java.io.PrintWriter;
 import java.util.HashMap;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * Provides APIs for IMS services, such as initiating IMS calls, and provides access to
@@ -185,6 +185,10 @@
     private boolean mIsWfcProvisioned = true;
     private boolean mIsVtProvisioned = true;
 
+    // Flag indicating data enabled or not. This flag should be in sync with
+    // DcTracker.isDataEnabled(). The flag will be set later during boot up.
+    private AtomicBoolean mDataEnabled = new AtomicBoolean(true);
+
     /**
      * Gets a manager instance.
      *
@@ -735,7 +739,7 @@
     }
 
     /**
-     * Update VC config
+     * Update video call over LTE config
      * @return whether feature is On
      * @throws ImsException
      */
@@ -744,11 +748,13 @@
         boolean enabled = isEnhanced4gLteModeSettingEnabledByUser(mContext) &&
                 isVtEnabledByUser(mContext);
         boolean isNonTty = isNonTtyOrTtyOnVolteEnabled(mContext);
-        boolean isFeatureOn = available && enabled && isNonTty;
+
+        boolean isFeatureOn = available && enabled && isNonTty && mDataEnabled.get();
 
         log("updateVideoCallFeatureValue: available = " + available
                 + ", enabled = " + enabled
-                + ", nonTTY = " + isNonTty);
+                + ", nonTTY = " + isNonTty
+                + ", data enabled = " + mDataEnabled.get());
 
         getConfigInterface().setFeatureValue(
                 ImsConfig.FeatureConstants.FEATURE_TYPE_VIDEO_OVER_LTE,
@@ -1353,7 +1359,8 @@
                         TelephonyManager.NETWORK_TYPE_LTE, turnOn ? 1 : 0, mImsConfigListener);
 
                 if (isVtEnabledByPlatform(mContext)) {
-                    boolean enableViLte = turnOn && isVtEnabledByUser(mContext);
+                    boolean enableViLte = turnOn && isVtEnabledByUser(mContext) &&
+                            mDataEnabled.get();
                     config.setFeatureValue(ImsConfig.FeatureConstants.FEATURE_TYPE_VIDEO_OVER_LTE,
                             TelephonyManager.NETWORK_TYPE_LTE,
                             enableViLte ? 1 : 0,
@@ -1640,11 +1647,21 @@
                 SubscriptionManager.getDefaultVoicePhoneId(), true);
     }
 
+    /**
+     * Set data enabled/disabled flag.
+     * @param enabled True if data is enabled, otherwise disabled.
+     */
+    public void setDataEnabled(boolean enabled) {
+        log("setDataEnabled: " + enabled);
+        mDataEnabled.set(enabled);
+    }
+
     public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
         pw.println("ImsManager:");
         pw.println("  mPhoneId = " + mPhoneId);
         pw.println("  mConfigUpdated = " + mConfigUpdated);
         pw.println("  mImsService = " + mImsService);
+        pw.println("  mDataEnabled = " + mDataEnabled.get());
 
         pw.println("  isGbaValid = " + isGbaValid(mContext));
         pw.println("  isImsTurnOffAllowed = " + isImsTurnOffAllowed());