Merge "Added several changes in data stack"
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 9963040..f9cc52e 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -2937,6 +2937,9 @@
try {
final Phone phone = getPhone(subId);
if (phone != null) {
+ if (phone.isUsingNewDataStack()) {
+ return phone.getDataNetworkController().getInternetDataNetworkState();
+ }
return PhoneConstantConversions.convertDataState(phone.getDataConnectionState());
} else {
return PhoneConstantConversions.convertDataState(