commit ed86e5837b426bcba625b57e466b8d04ddbd8008
author Robert Greenwalt <rgreenwalt@google.com> Wed May 21 20:03:20 2014 -0700
committer Dave Langemak <dlangemak@google.com> Tue May 27 19:40:31 2014 +0000
tree a38dbf74753c763740eebafb4bf4b99bb862ea38
parent e4d2b52d14533b105473419748e678a302dea87f

Move dis/enable of mobile data to Telephony

ConnectivityService doesn't do this anymore.

bug:15077247
Change-Id: I3208c91b2c0369b594987f39ca29da7478435513
(cherry picked from commit 9a32efc0c506eab679fd653924705c0010771fbd)

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 3354687..e79ad3c 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -21,7 +21,6 @@
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
-import android.net.ConnectivityManager;
 import android.net.Uri;
 import android.os.AsyncResult;
 import android.os.Binder;
@@ -867,9 +866,7 @@
 
     public boolean enableDataConnectivity() {
         enforceModifyPermission();
-        ConnectivityManager cm =
-                (ConnectivityManager)mApp.getSystemService(Context.CONNECTIVITY_SERVICE);
-        cm.setMobileDataEnabled(true);
+        mPhone.setDataEnabled(true);
         return true;
     }
 
@@ -885,9 +882,7 @@
 
     public boolean disableDataConnectivity() {
         enforceModifyPermission();
-        ConnectivityManager cm =
-                (ConnectivityManager)mApp.getSystemService(Context.CONNECTIVITY_SERVICE);
-        cm.setMobileDataEnabled(false);
+        mPhone.setDataEnabled(false);
         return true;
     }
 
@@ -1394,4 +1389,27 @@
         if (DBG) log("setPreferredNetworkType: " + (success ? "ok" : "fail"));
         return success;
     }
+
+    /**
+     * Set mobile data enabled
+     * Used by the user through settings etc to turn on/off mobile data
+     *
+     * @param enable {@code true} turn turn data on, else {@code false}
+     */
+    @Override
+    public void setDataEnabled(boolean enable) {
+        enforceModifyPermission();
+        mPhone.setDataEnabled(enable);
+    }
+
+    /**
+     * Get whether mobile data is enabled
+     *
+     * @return {@code true} if data is enabled else {@code false}
+     */
+    @Override
+    public boolean getDataEnabled() {
+        enforceModifyPermission();
+        return mPhone.getDataEnabled();
+    }
 }