Moved data settings to phone
Since there are multiple DcTrackers, but we only have
one set of data settings. So we need to move them from
DcTracker to Phone.
Test: Telephony sanity tests + unit tests
Bug: 73659459
Change-Id: I3d012262adc5cb0adc02049a4ade034a39d6fd68
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 7cbf80d..4e2cb15 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -1693,7 +1693,7 @@
int subId = mSubscriptionController.getDefaultDataSubId();
final Phone phone = getPhone(subId);
if (phone != null) {
- phone.setUserDataEnabled(true);
+ phone.getDataEnabledSettings().setUserDataEnabled(true);
return true;
} else {
return false;
@@ -1713,7 +1713,7 @@
int subId = mSubscriptionController.getDefaultDataSubId();
final Phone phone = getPhone(subId);
if (phone != null) {
- phone.setUserDataEnabled(false);
+ phone.getDataEnabledSettings().setUserDataEnabled(false);
return true;
} else {
return false;
@@ -4039,7 +4039,7 @@
Phone phone = PhoneFactory.getPhone(phoneId);
if (phone != null) {
if (DBG) log("setUserDataEnabled: subId=" + subId + " enable=" + enable);
- phone.setUserDataEnabled(enable);
+ phone.getDataEnabledSettings().setUserDataEnabled(enable);
} else {
loge("setUserDataEnabled: no phone found. Invalid subId=" + subId);
}
@@ -4127,7 +4127,7 @@
if (DBG) log("isDataEnabled: subId=" + subId + " phoneId=" + phoneId);
Phone phone = PhoneFactory.getPhone(phoneId);
if (phone != null) {
- boolean retVal = phone.isDataEnabled();
+ boolean retVal = phone.getDataEnabledSettings().isDataEnabled();
if (DBG) log("isDataEnabled: subId=" + subId + " retVal=" + retVal);
return retVal;
} else {
@@ -5430,7 +5430,7 @@
try {
Phone phone = getPhone(subId);
if (phone != null) {
- phone.setPolicyDataEnabled(enabled);
+ phone.getDataEnabledSettings().setPolicyDataEnabled(enabled);
}
} finally {
Binder.restoreCallingIdentity(identity);