LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 82cdc8cc: Merge "Fix Development app to use netd for routes" into honeycomb-LTE

Browse Source 
* commit '82cdc8cc426fa73b49412245b1c826d4acd29140':
  Fix Development app to use netd for routes
This commit is contained in:
Robert Greenwalt
2011-05-18 16:31:01 -07:00
committed by Android Git Automerger
parent d143387d72 82cdc8cc42
commit 4a76d154e4
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
apps/Development/src/com/android/development/Connectivity.java
View File

@@ -29,11 +29,13 @@ import android.content.SharedPreferences;
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 @@ public class Connectivity extends Activity {
private WifiManager mWm;
private PowerManager mPm;
private ConnectivityManager mCm;
private INetworkManagementService mNetd;
private WakeLock mWakeLock = null;
private WakeLock mScreenonWakeLock = null;
@@ -191,6 +194,8 @@ public class Connectivity extends Activity {
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 @@ public class Connectivity extends Activity {
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() {