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

Merge "Use the updated RouteInfo API." into lmp-preview-dev

Browse Source
This commit is contained in:
Robert Greenwalt
2014-06-11 23:42:44 +00:00
committed by Android (Google) Code Review
parent f7449cdb18 ef57b53c63
commit 410bcade76
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,6 +28,7 @@ import android.content.IntentFilter;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.PackageManager.NameNotFoundException;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.LinkAddress;
import android.net.NetworkUtils; import android.net.NetworkUtils;
import android.net.RouteInfo; import android.net.RouteInfo;
import android.net.wifi.ScanResult; import android.net.wifi.ScanResult;
@@ -525,7 +526,7 @@ public class Connectivity extends Activity {
private void onAddDefaultRoute() { private void onAddDefaultRoute() {
try { try {
int netId = Integer.valueOf(((TextView) findViewById(R.id.netid)).getText().toString()); int netId = Integer.valueOf(((TextView) findViewById(R.id.netid)).getText().toString());
mNetd.addRoute(netId, new RouteInfo(null, mNetd.addRoute(netId, new RouteInfo((LinkAddress) null,
NetworkUtils.numericToInetAddress("8.8.8.8"))); NetworkUtils.numericToInetAddress("8.8.8.8")));
} catch (Exception e) { } catch (Exception e) {
Log.e(TAG, "onAddDefaultRoute got exception: " + e.toString()); Log.e(TAG, "onAddDefaultRoute got exception: " + e.toString());
@@ -535,7 +536,7 @@ public class Connectivity extends Activity {
private void onRemoveDefaultRoute() { private void onRemoveDefaultRoute() {
try { try {
int netId = Integer.valueOf(((TextView) findViewById(R.id.netid)).getText().toString()); int netId = Integer.valueOf(((TextView) findViewById(R.id.netid)).getText().toString());
mNetd.removeRoute(netId, new RouteInfo(null, mNetd.removeRoute(netId, new RouteInfo((LinkAddress) null,
NetworkUtils.numericToInetAddress("8.8.8.8"))); NetworkUtils.numericToInetAddress("8.8.8.8")));
} catch (Exception e) { } catch (Exception e) {
Log.e(TAG, "onRemoveDefaultRoute got exception: " + e.toString()); Log.e(TAG, "onRemoveDefaultRoute got exception: " + e.toString());