Enable VoLTE/VT with overlay overrides.
This reverts commit 24b1f38ee9ef3da624dde258da170c54649bf89b.
Bug: 17134661
Change-Id: I7c021017b257a221ca98c07c539b0c6d227ce1da
diff --git a/src/java/com/android/internal/telephony/cdma/CDMAPhone.java b/src/java/com/android/internal/telephony/cdma/CDMAPhone.java
index 628abfd..f914866 100644
--- a/src/java/com/android/internal/telephony/cdma/CDMAPhone.java
+++ b/src/java/com/android/internal/telephony/cdma/CDMAPhone.java
@@ -51,17 +51,14 @@
import com.android.internal.telephony.CommandsInterface;
import com.android.internal.telephony.Connection;
import com.android.internal.telephony.IccPhoneBookInterfaceManager;
-import com.android.internal.telephony.IccSmsInterfaceManager;
import com.android.internal.telephony.MccTable;
import com.android.internal.telephony.MmiCode;
-import com.android.internal.telephony.OperatorInfo;
import com.android.internal.telephony.PhoneBase;
import com.android.internal.telephony.PhoneConstants;
import com.android.internal.telephony.PhoneNotifier;
import com.android.internal.telephony.PhoneProxy;
import com.android.internal.telephony.PhoneSubInfo;
import com.android.internal.telephony.ServiceStateTracker;
-import com.android.internal.telephony.SmsBroadcastUndelivered;
import com.android.internal.telephony.TelephonyIntents;
import com.android.internal.telephony.TelephonyProperties;
import com.android.internal.telephony.UUSInfo;
@@ -81,7 +78,6 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import static com.android.internal.telephony.PhoneConstants.SUBSCRIPTION_KEY;
import static com.android.internal.telephony.TelephonyProperties.PROPERTY_ICC_OPERATOR_ALPHA;
import static com.android.internal.telephony.TelephonyProperties.PROPERTY_ICC_OPERATOR_ISO_COUNTRY;
import static com.android.internal.telephony.TelephonyProperties.PROPERTY_ICC_OPERATOR_NUMERIC;
@@ -396,12 +392,9 @@
dial (String dialString, int videoState) throws CallStateException {
ImsPhone imsPhone = mImsPhone;
- boolean imsUseEnabled = mContext.getSharedPreferences(
- ImsManager.IMS_SHARED_PREFERENCES,
- Context.MODE_WORLD_READABLE).getBoolean(ImsManager.KEY_IMS_ON,
- ImsManager.IMS_DEFAULT_SETTING);
- imsUseEnabled = false;
-
+ boolean imsUseEnabled =
+ ImsManager.isEnhanced4gLteModeSettingEnabledByPlatform(mContext) &&
+ ImsManager.isEnhanced4gLteModeSettingEnabledByUser(mContext);
if (!imsUseEnabled) {
Rlog.w(LOG_TAG, "IMS is disabled: forced to CS");
}
diff --git a/src/java/com/android/internal/telephony/gsm/GSMPhone.java b/src/java/com/android/internal/telephony/gsm/GSMPhone.java
index 13b6782..d5aaa7c 100644
--- a/src/java/com/android/internal/telephony/gsm/GSMPhone.java
+++ b/src/java/com/android/internal/telephony/gsm/GSMPhone.java
@@ -34,7 +34,6 @@
import android.telephony.PhoneNumberUtils;
import android.telephony.ServiceState;
import android.telephony.TelephonyManager;
-import android.telephony.VoLteServiceState;
import com.android.ims.ImsManager;
import com.android.internal.telephony.CallTracker;
@@ -54,7 +53,6 @@
import static com.android.internal.telephony.CommandsInterface.SERVICE_CLASS_VOICE;
import static com.android.internal.telephony.TelephonyProperties.PROPERTY_BASEBAND_VERSION;
-import com.android.internal.telephony.SmsBroadcastUndelivered;
import com.android.internal.telephony.dataconnection.DcTracker;
import com.android.internal.telephony.Call;
import com.android.internal.telephony.CallForwardInfo;
@@ -62,17 +60,14 @@
import com.android.internal.telephony.CommandsInterface;
import com.android.internal.telephony.Connection;
import com.android.internal.telephony.IccPhoneBookInterfaceManager;
-import com.android.internal.telephony.IccSmsInterfaceManager;
import com.android.internal.telephony.MmiCode;
-import com.android.internal.telephony.OperatorInfo;
import com.android.internal.telephony.Phone;
import com.android.internal.telephony.PhoneBase;
-import com.android.internal.telephony.PhoneFactory;
import com.android.internal.telephony.PhoneConstants;
import com.android.internal.telephony.PhoneNotifier;
import com.android.internal.telephony.PhoneProxy;
import com.android.internal.telephony.PhoneSubInfo;
-import com.android.internal.telephony.Subscription;
+
import android.telephony.SubscriptionManager;
import com.android.internal.telephony.TelephonyProperties;
import com.android.internal.telephony.UUSInfo;
@@ -89,11 +84,7 @@
import java.io.FileDescriptor;
-import java.io.IOException;
import java.io.PrintWriter;
-import java.net.InetSocketAddress;
-import java.net.ServerSocket;
-import java.net.Socket;
import java.util.ArrayList;
import java.util.List;
@@ -801,12 +792,9 @@
dial (String dialString, UUSInfo uusInfo, int videoState) throws CallStateException {
ImsPhone imsPhone = mImsPhone;
- boolean imsUseEnabled = mContext.getSharedPreferences(
- ImsManager.IMS_SHARED_PREFERENCES,
- Context.MODE_WORLD_READABLE).getBoolean(ImsManager.KEY_IMS_ON,
- ImsManager.IMS_DEFAULT_SETTING);
- imsUseEnabled = false;
-
+ boolean imsUseEnabled =
+ ImsManager.isEnhanced4gLteModeSettingEnabledByPlatform(mContext) &&
+ ImsManager.isEnhanced4gLteModeSettingEnabledByUser(mContext);
if (!imsUseEnabled) {
Rlog.w(LOG_TAG, "IMS is disabled: forced to CS");
}
