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

Merge remote branch 'goog/honeycomb-mr1' into honeycomb-mr2

Browse Source 
Conflicts:
	apps/CtsVerifier/AndroidManifest.xml
	tools/host/src/com/android/cts/Version.java

Change-Id: I5e9642c74dd3381865e731567e7decebb9ab2b71
This commit is contained in:
Brian Muramatsu
2011-10-07 11:55:14 -07:00
parent 68f66bffff 93ca5b572b
commit 0bcdf4ac97
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/cts/net/src/android/net/cts/ListeningPortsTest.java
View File

@@ -118,13 +118,18 @@ public class ListeningPortsTest extends TestCase {
String localAddress = fields[1];
String state = fields[3];
String uid = fields[7];
assertTrue(procFilePath + " should have an IP address in the second column",
isAddress(localAddress));
String localIp = localAddress.split(":")[0];
int localPort = Integer.parseInt(localAddress.split(":")[1], 16);
if (!isException(localAddress) && isPortListening(state, isTcp)) {
throw new ListeningPortsAssertionError(
"Found port listening on " + localAddress + " in " + procFilePath);
"Found port listening on addr=" + localIp + ", port="
+ localPort + ", UID=" + uid + " in " + procFilePath);
}
}
} catch (FileNotFoundException notFound) {