From 0c292bb1176fb40a157b3166db35d5402726f3c6 Mon Sep 17 00:00:00 2001 From: android-htc-contribute Date: Wed, 5 Oct 2011 11:09:36 +0800 Subject: [PATCH 1/2] =?UTF-8?q?Data=20call=20establish=20time=20is=20relat?= =?UTF-8?q?ed=20to=20network=20condition=20which=20can=E2=80=99t=20be=20co?= =?UTF-8?q?ntrolled=20by=20the=20device.=20Extend=20the=20time=20limitatio?= =?UTF-8?q?n=20to=2030=20seconds=20to=20cover=20most=20of=20the=20cases.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I522f7eb23baa9a652fb3fd633d200cd6307180c8 --- tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java index 96a935b549..77191cbd67 100644 --- a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java +++ b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java @@ -287,7 +287,7 @@ public class ConnectivityManagerTest extends AndroidTestCase { } public boolean waitForConnection() throws InterruptedException { - return mReceiveLatch.await(10, TimeUnit.SECONDS); + return mReceiveLatch.await(30, TimeUnit.SECONDS); } } } From 531debc2802064e0e242fc873a711787d6dcd762 Mon Sep 17 00:00:00 2001 From: Nick Kralevich Date: Tue, 25 Oct 2011 10:16:06 -0700 Subject: [PATCH 2/2] fix IPv6 loopback pattern In /proc/net/udp6 and /proc/net/tcp6, the addresses stored in that file are in network byte order. As a result, the IPv6 loopback address, ::1, is stored as 00000000000000000000000001000000 NOT 00000000000000000000000000000001 Bug: 5473686 Change-Id: I73098d52c981c48d82423c8ce99b6b20d11a5568 --- tests/cts/net/src/android/net/cts/ListeningPortsTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/cts/net/src/android/net/cts/ListeningPortsTest.java b/tests/cts/net/src/android/net/cts/ListeningPortsTest.java index 5c1ba7cab8..bcec0fe89e 100644 --- a/tests/cts/net/src/android/net/cts/ListeningPortsTest.java +++ b/tests/cts/net/src/android/net/cts/ListeningPortsTest.java @@ -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 }