commit 0d4c500e98f7499db524c8073e2c8e9dfaa1febb
author Robert Greenwalt <rgreenwalt@google.com> Wed May 21 20:02:32 2014 -0700
committer Robert Greenwalt <rgreenwalt@google.com> Wed May 21 23:18:02 2014 -0700
tree 81f60e8fba31b622e126d923a0912386de67dcd3
parent c8e7e43a9df90bd2bdd823cdc61361427ecb4c4e

Move mobile data dis/enable to Telephony

ConnectivityService doesn't do this anymore.

bug:15077247
Change-Id: I3208c91b2c0369b594987f39ca29da7478435513

src/com/android/settings/DataUsageSummary.java

diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
index 9f68023..86a73c2 100644
--- a/src/com/android/settings/DataUsageSummary.java
+++ b/src/com/android/settings/DataUsageSummary.java
@@ -192,7 +192,8 @@
     private INetworkManagementService mNetworkService;
     private INetworkStatsService mStatsService;
     private NetworkPolicyManager mPolicyManager;
-    private ConnectivityManager mConnService;
+    private TelephonyManager mTelephonyManager;
+
 
     private INetworkStatsSession mStatsSession;
 
@@ -274,7 +275,7 @@
         mStatsService = INetworkStatsService.Stub.asInterface(
                 ServiceManager.getService(Context.NETWORK_STATS_SERVICE));
         mPolicyManager = NetworkPolicyManager.from(context);
-        mConnService = ConnectivityManager.from(context);
+        mTelephonyManager = TelephonyManager.from(context);
 
         mPrefs = getActivity().getSharedPreferences(PREF_FILE, Context.MODE_PRIVATE);
 
@@ -872,13 +873,13 @@
             // TODO: deprecate and remove this once enabled flag is on policy
             return mMobileDataEnabled;
         } else {
-            return mConnService.getMobileDataEnabled();
+            return mTelephonyManager.getDataEnabled();
         }
     }
 
     private void setMobileDataEnabled(boolean enabled) {
         if (LOGD) Log.d(TAG, "setMobileDataEnabled()");
-        mConnService.setMobileDataEnabled(enabled);
+        mTelephonyManager.setDataEnabled(enabled);
         mMobileDataEnabled = enabled;
         updatePolicy(false);
     }