From e5accf70fb6f30f0f1b6c7f93ea8d21477443942 Mon Sep 17 00:00:00 2001 From: Jack Yu Date: Thu, 13 Dec 2018 11:51:20 -0800 Subject: [PATCH] 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: If11a6eff057a18b4aa97addbb348537bd3194e1a Change-Id: If11a6eff057a18b4aa97addbb348537bd3194e1a (cherry picked from commit 50972ed89e9871d73ee8722bcde458170084ba08) --- src/com/android/settings/RadioInfo.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/RadioInfo.java b/src/com/android/settings/RadioInfo.java index 1f528e35407..6276b19db46 100644 --- a/src/com/android/settings/RadioInfo.java +++ b/src/com/android/settings/RadioInfo.java @@ -1199,12 +1199,10 @@ public class RadioInfo extends Activity { int state = mTelephonyManager.getDataState(); switch (state) { case TelephonyManager.DATA_CONNECTED: - //FIXME: Replace with a TelephonyManager call - phone.setUserDataEnabled(false); + mTelephonyManager.setDataEnabled(false); break; case TelephonyManager.DATA_DISCONNECTED: - //FIXME: Replace with a TelephonyManager call - phone.setUserDataEnabled(true); + mTelephonyManager.setDataEnabled(true); break; default: // do nothing