summaryrefslogtreecommitdiffstats
path: root/net/android
diff options
context:
space:
mode:
authordubroy@chromium.org <dubroy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-04 16:26:35 +0000
committerdubroy@chromium.org <dubroy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-04 16:26:35 +0000
commiteafe1f91f01c34e724d90f36d06addef2088f0a9 (patch)
treee82db0b69f2d8de43c8b690be046e6c6d7326355 /net/android
parent8e363d494aa9077ee6cd123a38a9df69d2900be5 (diff)
downloadchromium_src-eafe1f91f01c34e724d90f36d06addef2088f0a9.zip
chromium_src-eafe1f91f01c34e724d90f36d06addef2088f0a9.tar.gz
chromium_src-eafe1f91f01c34e724d90f36d06addef2088f0a9.tar.bz2
Revert 238671 "Added net::NetworkInterface::interface_index."
Speculative revert to see if it fixes the issues with net_unittests on WinXP: http://build.chromium.org/p/chromium.win/builders/XP%20Tests%20%282%29/builds/32133/steps/net_unittests/logs/stdio > Added net::NetworkInterface::interface_index. > Not implemented for Android. > > BUG=319068 > > Review URL: https://codereview.chromium.org/100703002 TBR=vitalybuka@chromium.org Review URL: https://codereview.chromium.org/101403004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238707 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/android')
-rw-r--r--net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java15
1 files changed, 5 insertions, 10 deletions
diff --git a/net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java b/net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java
index b7aec32..49b6634 100644
--- a/net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java
+++ b/net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java
@@ -143,12 +143,11 @@ class AndroidNetworkLibrary {
/**
* @return the network interfaces list (if any) string. The items in
- * the list string are delimited by a new line, each item
- * is tab separated network interface name, address with network
- * prefix length and network interface index.
- * as "name\taddress/prefix\tindex". e.g.
- * eth0\t10.0.0.2/8\t5\neth0\tfe80::5054:ff:fe12:3456/16\t5
- * represents a network list string with two items.
+ * the list string are delimited by a semicolon ";", each item
+ * is a network interface name and address pair and formatted
+ * as "name,address". e.g.
+ * eth0,10.0.0.2;eth0,fe80::5054:ff:fe12:3456
+ * represents a network list string which containts two items.
*/
@CalledByNative
static public String getNetworkList() {
@@ -184,10 +183,6 @@ class AndroidNetworkLibrary {
addressString.append(ipAddress);
addressString.append("/");
addressString.append(interfaceAddress.getNetworkPrefixLength());
- addressString.append("\t");
-
- // TODO(vitalybuka): use netIf.getIndex() when API level 19 is availible.
- addressString.append("0");
if (result.length() != 0)
result.append("\n");