commit 82cdc8cc426fa73b49412245b1c826d4acd29140
author Robert Greenwalt <rgreenwalt@google.com> Wed May 18 15:29:42 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 18 15:29:42 2011 -0700
tree a8e5da7be3800eddc7839883b8d603f57925d26b
parent d9012d1bfa132969fb8fed737e2f9f19eefbc0b5
parent b925721fdfca6e44ce91eb6333869cea95f97856

Merge "Fix Development app to use netd for routes" into honeycomb-LTE

apps/Development/src/com/android/development/Connectivity.java

diff --git a/apps/Development/src/com/android/development/Connectivity.java b/apps/Development/src/com/android/development/Connectivity.java
index c7029ec..c62d9b5 100644
--- a/apps/Development/src/com/android/development/Connectivity.java
+++ b/apps/Development/src/com/android/development/Connectivity.java
@@ -29,11 +29,13 @@
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.net.ConnectivityManager;
 import android.net.NetworkUtils;
+import android.net.RouteInfo;
 import android.net.wifi.WifiManager;
 import android.os.RemoteException;
 import android.os.Handler;
 import android.os.Message;
 import android.os.IBinder;
+import android.os.INetworkManagementService;
 import android.os.Parcel;
 import android.os.PowerManager;
 import android.os.PowerManager.WakeLock;
@@ -99,6 +101,7 @@
     private WifiManager mWm;
     private PowerManager mPm;
     private ConnectivityManager mCm;
+    private INetworkManagementService mNetd;
 
     private WakeLock mWakeLock = null;
     private WakeLock mScreenonWakeLock = null;
@@ -191,6 +194,8 @@
         mWm = (WifiManager)getSystemService(Context.WIFI_SERVICE);
         mPm = (PowerManager)getSystemService(Context.POWER_SERVICE);
         mCm = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
+        IBinder b = ServiceManager.getService(Context.NETWORKMANAGEMENT_SERVICE);
+        mNetd = INetworkManagementService.Stub.asInterface(b);
 
         findViewById(R.id.enableWifi).setOnClickListener(mClickListener);
         findViewById(R.id.disableWifi).setOnClickListener(mClickListener);
@@ -372,12 +377,20 @@
 
     private void onAddDefaultRoute() {
         try {
-            NetworkUtils.addRoute("eth0", "0.0.0.0", 0, "8.8.8.8");
-        } catch (Exception e) { }
+            mNetd.addRoute("eth0", new RouteInfo(null,
+                    NetworkUtils.numericToInetAddress("8.8.8.8")));
+        } catch (Exception e) {
+            Log.e(TAG, "onAddDefaultRoute got exception: " + e.toString());
+        }
     }
 
     private void onRemoveDefaultRoute() {
-        Log.e(TAG, "removeDefaultRoute returned "+NetworkUtils.removeDefaultRoute("eth0"));
+        try {
+            mNetd.removeRoute("eth0", new RouteInfo(null,
+                    NetworkUtils.numericToInetAddress("8.8.8.8")));
+        } catch (Exception e) {
+            Log.e(TAG, "onRemoveDefaultRoute got exception: " + e.toString());
+        }
     }
 
     private void onRoutedHttpRequest() {