commit 7a030e5b7f55c3898bcc541d953ab300416f4af8
author Jack Yu <jackyu@google.com> Thu Dec 13 11:51:28 2018 -0800
committer Jack Yu <jackyu@google.com> Thu Dec 20 15:20:53 2018 -0800
tree 495b9036ec5e1e78ef1cd2f2cb16c24bf75fba64
parent 7ec6e722def8108fa07ef1b9afd08cdfc9a9a6fa

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
Merged-In: I3d012262adc5cb0adc02049a4ade034a39d6fd68
Change-Id: I3d012262adc5cb0adc02049a4ade034a39d6fd68
(cherry picked from commit d79fba2f283ef544df1d9016a683a94d8c590660)

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 43ecbd7..71864ab 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -1689,7 +1689,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;
@@ -1709,7 +1709,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;
@@ -4035,7 +4035,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);
             }
@@ -4123,7 +4123,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 {
@@ -5428,7 +5428,7 @@
         try {
             Phone phone = getPhone(subId);
             if (phone != null) {
-                phone.setPolicyDataEnabled(enabled);
+                phone.getDataEnabledSettings().setPolicyDataEnabled(enabled);
             }
         } finally {
             Binder.restoreCallingIdentity(identity);