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
This commit is contained in:
Brian Muramatsu
2011-11-17 16:51:08 -08:00
parent 0bcdf4ac97 5e1dd100c8
commit f021575916
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
View File

@@ -298,7 +298,7 @@ public class ConnectivityManagerTest extends AndroidTestCase {
}
public boolean waitForConnection() throws InterruptedException {
return mReceiveLatch.await(10, TimeUnit.SECONDS);
return mReceiveLatch.await(30, TimeUnit.SECONDS);
}
}
}

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

@@ -46,7 +46,7 @@ public class ListeningPortsTest extends TestCase {
EXCEPTION_PATTERNS.add("[0-9A-F]{6}7F:[0-9A-F]{4}"); // IPv4 Loopback
// IPv6 exceptions
EXCEPTION_PATTERNS.add("[0]{31}1:[0-9A-F]{4}"); // IPv6 Loopback
EXCEPTION_PATTERNS.add("[0]{25}1[0]{6}:[0-9A-F]{4}"); // IPv6 Loopback
EXCEPTION_PATTERNS.add("[0]{16}[0]{4}[0]{4}[0-9A-F]{6}7F:[0-9A-F]{4}"); // IPv4-6 Conversion
EXCEPTION_PATTERNS.add("[0]{16}[F]{4}[0]{4}[0-9A-F]{6}7F:[0-9A-F]{4}"); // IPv4-6 Conversion
}