commit 5965cb11a5685b9118df890decc3867d93878a8f
author Robert Greenwalt <rgreenwalt@google.com> Mon Nov 29 10:45:43 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 29 10:45:43 2010 -0800
tree 9ff02ec1b6e92fcc6de96ef6d38a4de206616cb8
parent c428dc6f019537fd2c4b55a62eff6891d7bb46e2
parent 99be5007ef13a403404d5455c622cdf7af96a1ca

Merge "Don't use the internal data-enable mechanism"

src/com/android/settings/RadioInfo.java

diff --git a/src/com/android/settings/RadioInfo.java b/src/com/android/settings/RadioInfo.java
index fd643cd..beea51e 100644
--- a/src/com/android/settings/RadioInfo.java
+++ b/src/com/android/settings/RadioInfo.java
@@ -17,10 +17,12 @@
 package com.android.settings;
 
 import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.content.res.Resources;
+import android.net.ConnectivityManager;
 import android.net.LinkProperties;
 import android.net.Uri;
 import android.os.AsyncResult;
@@ -856,13 +858,15 @@
 
     private MenuItem.OnMenuItemClickListener mToggleData = new MenuItem.OnMenuItemClickListener() {
         public boolean onMenuItemClick(MenuItem item) {
+            ConnectivityManager cm =
+                    (ConnectivityManager)getSystemService(Context.CONNECTIVITY_SERVICE);
             int state = mTelephonyManager.getDataState();
             switch (state) {
                 case TelephonyManager.DATA_CONNECTED:
-                    phone.disableDataConnectivity();
+                    cm.setMobileDataEnabled(false);
                     break;
                 case TelephonyManager.DATA_DISCONNECTED:
-                    phone.enableDataConnectivity();
+                    cm.setMobileDataEnabled(true);
                     break;
                 default:
                     // do nothing