Commit Graph

456 Commits

Author SHA1 Message Date
Erik Kline
551fccedf3 am e1bbb869: am 19467ab3: am 28c60e6e: am d20107df: Merge "Add trivial retransmission of QUIC packets" into mnc-dev
* commit 'e1bbb86947e2933f192b760e25551d0edc00597d':
  Add trivial retransmission of QUIC packets
2015-08-19 23:08:47 +00:00
Erik Kline
f19c63e5b1 Add trivial retransmission of QUIC packets
Also:
    - correct use of strlcpy()
    - add some more logging

Bug: 21833352
Bug: 22181260
Change-Id: Id153e17b8d4d32a35d38846599aa51147739e163
2015-08-20 04:45:08 +09:00
Lorenzo Colitti
7f6e116a6f am 3bf4612e: am 35a548e1: am ca6150b2: am c2aaf355: Merge "Update CTS for unsupported legacy ConnectivityManager APIs" into mnc-dev
* commit '3bf4612e6462a37242f3784405199d1ec6ba8093':
  Update CTS for unsupported legacy ConnectivityManager APIs
2015-08-07 02:13:44 +00:00
Lorenzo Colitti
cfc277c7f1 Update CTS for unsupported legacy ConnectivityManager APIs
http://ag/736511 made the deprecated ConnectivityManager routing
APIs {start,stop}UsingNetworkFeature and requestRouteToHost throw
exceptions for apps whose target SDK version is 23 or above. Move
the tests for these APIs to a new APK that targets SDK version 22
and update the current test APK to ensure that they throw an
exception.

Bug: 22977863
Bug: 23003441
Bug: 23003635
Change-Id: Icf58e928fdc0018d977ce8aa315866659d32debb
2015-08-07 10:45:33 +09:00
Daniel Xie
c4662496ff am f0c0af79: am 57221480: am 05dc8dbc: am b9453ff9: am 9417d728: am ea9003d9: am 2b44bd54: am 42445696: Merge "Support WiFi only device at runtime." into kitkat-cts-dev automerge: 545427f automerge: f6915b6
* commit 'f0c0af79eb0bb8f67e051c845a1a96e402bb8241':
  Support WiFi only device at runtime.
2015-08-06 07:26:48 +00:00
Daniel Xie
b9453ff934 am 9417d728: am ea9003d9: am 2b44bd54: am 42445696: Merge "Support WiFi only device at runtime." into kitkat-cts-dev automerge: 545427f automerge: f6915b6
* commit '9417d7288ddd37b5d2e347a724afb76cf987f70f':
  Support WiFi only device at runtime.
2015-08-06 05:11:27 +00:00
Daniel Xie
9417d7288d am ea9003d9: am 2b44bd54: am 42445696: Merge "Support WiFi only device at runtime." into kitkat-cts-dev automerge: 545427f automerge: f6915b6
* commit 'ea9003d9692e1fc1384a02686c3d36f195d9d55e':
  Support WiFi only device at runtime.
2015-08-05 18:28:01 +00:00
Jim Guggemos
261d045317 am ada73333: am e8bc6e3f: am 0334b8ec: am b50470fc: Merge "New tests for (un)registerNetworkCallback with PendingIntent." into mnc-dev
* commit 'ada73333baec57907cbcba76ce38ef47ad9800da':
  New tests for (un)registerNetworkCallback with PendingIntent.
2015-07-30 00:28:07 +00:00
Jim Guggemos
b50470fcea Merge "New tests for (un)registerNetworkCallback with PendingIntent." into mnc-dev 2015-07-29 23:27:19 +00:00
Fyodor Kupolov
ecb47a6298 am c678fb40: am 6ec28d2b: am 9fc4e8cc: am 6a4d762c: Merge "Fix for ScanResultTest and WifiManagerTest" into mnc-dev
* commit 'c678fb40ffb5acddd5d5551f971b98827a8cab93':
  Fix for ScanResultTest and WifiManagerTest
2015-07-29 22:47:41 +00:00
Fyodor Kupolov
e57e9bcb96 Fix for ScanResultTest and WifiManagerTest
Added ACCESS_COARSE_LOCATION permission - it is now required to receive Wi-Fi
scan results(b/21852542).

Bug: 22790182
Change-Id: Idb72c200b08f7e4e95571504ab42c9e706f5c921
2015-07-29 11:24:34 -07:00
Daniel Xie
ea9003d969 am 2b44bd54: am 42445696: Merge "Support WiFi only device at runtime." into kitkat-cts-dev automerge: 545427f automerge: f6915b6
* commit '2b44bd54f88a4374ea631994650d464df4d6fe4e':
  Support WiFi only device at runtime.
2015-07-28 18:15:16 +00:00
Jim Guggemos
9030d1aceb New tests for (un)registerNetworkCallback with PendingIntent.
Fixed up flakiness if WiFi was disabled before executing
the test.

Bug: 21833352
Change-Id: Ief7e12c4a7151722ec926ac38ced9f8903cdb607
2015-07-28 00:13:02 -06:00
Erik Kline
0d090207ba am 26730e80: am 5ca3ddb5: am 1685838d: am d56f0067: Merge "QUIC port 80 support is going away" into mnc-dev
* commit '26730e807e491611e0489bb4aaa19f7f331dd9f5':
  QUIC port 80 support is going away
2015-07-27 06:03:42 +00:00
Erik Kline
e2815d360a QUIC port 80 support is going away
Change-Id: I29a81e67d121b2e7e832e9e0d5e798d70b4c594a
2015-07-27 13:45:15 +09:00
Daniel Xie
424456969a Merge "Support WiFi only device at runtime." into kitkat-cts-dev automerge: 545427f
automerge: f6915b6

* commit 'f6915b6f02ea3ff39bab6bd993072c323f470f27':
  Support WiFi only device at runtime.
2015-07-25 04:58:57 +00:00
Daniel Xie
f6915b6f02 Merge "Support WiFi only device at runtime." into kitkat-cts-dev
automerge: 545427f

* commit '545427fc9ecf0d1ed3e4d34697e11e09c5775b63':
  Support WiFi only device at runtime.
2015-07-24 22:32:23 +00:00
Daniel Xie
545427fc9e Merge "Support WiFi only device at runtime." into kitkat-cts-dev 2015-07-23 17:41:42 +00:00
Liangcai Li
adbcf22426 Support WiFi only device at runtime.
As what is done in ConnectivityService to fix
bug: 8562845. Otherwise some related tests like 'testGetAllNetworkInfo'
would fail with runtime detection on WiFi only device.

Change-Id: I94922729c11826b3711abf42f594dcdd994324b6
Signed-off-by: Liangcai Li <liangcail@nvidia.com>
2015-07-23 15:42:27 +08:00
Jim Guggemos
2e32665eb9 am 7fd5fcd3: am 7729b780: am c363eb8b: am 781c5be7: Merge "New CTS test for ConnectivityManager.(un)registerNetworkCallback." into mnc-dev
* commit '7fd5fcd3a10afba61d18628cfffbaad182945504':
  New CTS test for ConnectivityManager.(un)registerNetworkCallback.
2015-07-17 16:09:19 +00:00
Jim Guggemos
7443acfd8f New CTS test for ConnectivityManager.(un)registerNetworkCallback.
Tested on device with wifi enabled and disabled before
executing the test.

Bug: 21833352
Change-Id: I42222bd229a370f780f08fa056d331ff1431b87a
2015-07-16 17:46:58 -06:00
Jim Guggemos
25062b987d am be603e66: am 3fae4215: am 4156442e: am 77d482d6: Merge "New CTS test for ConnectivityManager.getActiveNetwork." into mnc-dev
* commit 'be603e666a41e3798d879716681bc00191fb7a26':
  New CTS test for ConnectivityManager.getActiveNetwork.
2015-07-16 13:49:26 +00:00
Jim Guggemos
77d482d6b3 Merge "New CTS test for ConnectivityManager.getActiveNetwork." into mnc-dev 2015-07-16 13:00:43 +00:00
Jim Guggemos
708349cba6 New CTS test for ConnectivityManager.getActiveNetwork.
Bug: 21833352
Change-Id: I970a114e3c94c9885186bd55c608bbc4bcb9a7fa
2015-07-15 22:36:14 -06:00
JP Abgrall
e0753bc3b2 am 84442605: am 9d8ab01d: am bb34bbaf: am 1f0f6e95: am 92ec8f77: am c4b48e7e: am 4e7386bd: am 89b22492: Merge "Fix CTS build" into lollipop-cts-dev automerge: ab0f0fe
* commit '84442605073470ba341cbfe0ef25af07b3f3ed17':
  Fix CTS build
2015-07-15 06:55:23 +00:00
JP Abgrall
1f0f6e952f am 92ec8f77: am c4b48e7e: am 4e7386bd: am 89b22492: Merge "Fix CTS build" into lollipop-cts-dev automerge: ab0f0fe
* commit '92ec8f7720cb5232e1e07f21d9e53e17b298dfa2':
  Fix CTS build
2015-07-15 06:03:47 +00:00
JP Abgrall
92ec8f7720 am c4b48e7e: am 4e7386bd: am 89b22492: Merge "Fix CTS build" into lollipop-cts-dev automerge: ab0f0fe
* commit 'c4b48e7e39465eb0bb34d481e4dc46b5e8a4239c':
  Fix CTS build
2015-07-15 05:50:51 +00:00
JP Abgrall
c4b48e7e39 am 4e7386bd: am 89b22492: Merge "Fix CTS build" into lollipop-cts-dev automerge: ab0f0fe
* commit '4e7386bda93c41b622c64b1ce17b7d1b8bd503fd':
  Fix CTS build
2015-07-15 05:37:08 +00:00
JP Abgrall
89b22492ee Merge "Fix CTS build" into lollipop-cts-dev
automerge: ab0f0fe

* commit 'ab0f0fe884c280adcde0259f4692cebfb3d0bf08':
  Fix CTS build
2015-07-15 05:21:41 +00:00
JP Abgrall
ab0f0fe884 Merge "Fix CTS build" into lollipop-cts-dev 2015-07-15 05:21:26 +00:00
Bart Sears
aa43f342e1 am 512df522: am 525d2597: am d57e21f4: am a8a7282c: Merge "Fix CTS build" into mnc-dev
* commit '512df522ba49cf0cd4c6062ef89a66651231415a':
  Fix CTS build
2015-07-15 03:10:18 +00:00
JP Abgrall
0852bee4a9 Fix CTS build
Revert "Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev"

This reverts commit 9feaaaf446, reversing
changes made to 65fbe1fcd153c5647f8d1e1a7443b3f04b7b25fd.
2015-07-14 19:13:31 -07:00
JP Abgrall
810a62236c Fix CTS build
Revert "Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev"

This reverts commit 9feaaaf446, reversing
changes made to 65fbe1fcd153c5647f8d1e1a7443b3f04b7b25fd.
2015-07-14 18:59:40 -07:00
Unsuk Jung
189904be01 am 11fc5abf: am d619018e: am c92c2780: am 75cabb40: am 470d1704: am b2ff97c6: am 183662b8: am 3c88311f: Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev automerge: 7e84d75 automerge: 9feaaaf
* commit '11fc5abfa4814ba3429965053821ae93566237c8':
  Fix CTS android.net package testTrafficStatsForLocalhost seldom fail issue
2015-07-15 00:00:21 +00:00
Unsuk Jung
75cabb40db am 470d1704: am b2ff97c6: am 183662b8: am 3c88311f: Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev automerge: 7e84d75 automerge: 9feaaaf
* commit '470d17043a32058f989ba5832cb5f0875ad29859':
  Fix CTS android.net package testTrafficStatsForLocalhost seldom fail issue
2015-07-14 22:33:58 +00:00
Unsuk Jung
470d17043a am b2ff97c6: am 183662b8: am 3c88311f: Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev automerge: 7e84d75 automerge: 9feaaaf
* commit 'b2ff97c6589dd3d3c5e3da5f7c7a69b7a42fb317':
  Fix CTS android.net package testTrafficStatsForLocalhost seldom fail issue
2015-07-14 22:19:12 +00:00
Unsuk Jung
b2ff97c658 am 183662b8: am 3c88311f: Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev automerge: 7e84d75 automerge: 9feaaaf
* commit '183662b8269c2f2b1b63a3791c663c46d14a3d90':
  Fix CTS android.net package testTrafficStatsForLocalhost seldom fail issue
2015-07-14 22:03:46 +00:00
Unsuk Jung
3c88311fb9 Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev automerge: 7e84d75
automerge: 9feaaaf

* commit '9feaaaf44682c72dc5c771c93ef01ec793b6a7e3':
  Fix CTS android.net package testTrafficStatsForLocalhost seldom fail issue
2015-07-14 21:42:50 +00:00
Unsuk Jung
9feaaaf446 Merge "resolve merge conflicts of a97c792 to kitkat-cts-dev" into kitkat-cts-dev
automerge: 7e84d75

* commit '7e84d75c830b0ddaa499293723e427bca510dbaa':
  Fix CTS android.net package testTrafficStatsForLocalhost seldom fail issue
2015-07-14 21:42:04 +00:00
Unsuk Jung
9d02ab8484 resolve merge conflicts of a97c792 to kitkat-cts-dev
Change-Id: I7598ab40b38b26e3ea6f38764dd6b6793e243c8f
2015-07-13 22:50:02 -07:00
Unsuk Jung
a97c792cbd Merge "Fix CTS android.net package testTrafficStatsForLocalhost seldom fail issue" into jb-mr2-cts-dev 2015-07-13 23:43:34 +00:00
Junjie Hu
20b7b91edf Fix CTS android.net package testTrafficStatsForLocalhost seldom fail issue
(cherry-picked from master: 0d4434d998
  conflict + added Log)

For testTrafficStatsForLocalhost's UID testing, it will also calcuate the wlan0 interface.
There are some TCP re-tranmission in SSLCertificateSocketFactoryTest and it is the same UID as this test case. Need to consider those extra pacetks.
For example,
   Before testTrafficStatsForLocalhost test casae:
   01-08 15:49:11.316  7826  7839 D TrafficStats: parseUidStats, buffer: 14 wlan0 0x0 10067 0 31857 67 4582 55 31857 67 0 0 0 0 4582 55 0 0 0 0
   01-08 15:49:11.335  7826  7839 D TrafficStats: parseUidStats, buffer: 24 lo    0x0 10067 0 40    1    60 1 40 1 0 0 0 0 60 1 0 0 0 0
   After testTrafficStatsForLocalhost test casae:
   01-08 15:49:19.210  7826  7839 D TrafficStats: parseUidStats, buffer: 14 wlan0 0x0 10067 0 31857 67 4738 58 31857 67 0 0 0 0 4738 58 0 0 0 0
   01-08 15:49:19.212  7826  7839 D TrafficStats: parseUidStats, buffer: 24 lo 0x0 10067 0 1155336 2053 1155408 2054 1155336 2053 0 0 0 0 1155408 2054 0 0 0 0
   => There are three extra IP packets after testing due to TCP FIN retreamsisions in previous test case
Suggest to add some extra IP packets for consider the extra traffic in wlan0 interface.
Signed-off-by: Junjie Hu <junjie.hu@mediatek.com>

Change-Id: I981f98fc8647469fb105361516b6a59c53530c70
2015-07-10 19:28:44 -07:00
Ang Li
9f80b1b93a am b8ff204d: am de0d14d5: am c43ab9ae: am fd5ffee7: Merge "Fix a naming error in WifiEnterpriseConfigTest.java b/22349111" into mnc-dev
* commit 'b8ff204d2a2703544a7286342f42b1f6ac6038aa':
  Fix a naming error in WifiEnterpriseConfigTest.java b/22349111
2015-07-09 23:17:53 +00:00
Ang Li
2ee5bd54a5 Fix a naming error in WifiEnterpriseConfigTest.java
b/22349111

Change-Id: Ic9c847dfb1d58f274e91e22042c07995c72daa12
2015-07-08 13:45:14 -07:00
Neil Fuller
e6f6d5cb67 am 10a6f377: am b23c9498: Merge "Fix missing socket closure in LocalSocketTest"
* commit '10a6f37757a36a2a05bd1b60af8b67d21d094a78':
  Fix missing socket closure in LocalSocketTest
2015-07-07 16:23:56 +00:00
Ang Li
0f708c80fd am 7335fa66: am a4ebccd7: am 4b578ecb: am f2e04bbb: Merge "Add CTS tests for passpoint APIs in enterprise config. b/22001019" into mnc-dev
* commit '7335fa6670e6e2ac966ffb450fbfbcf993edca6c':
  Add CTS tests for passpoint APIs in enterprise config. b/22001019
2015-07-06 23:10:26 +00:00
Ang Li
f2e04bbbe6 Merge "Add CTS tests for passpoint APIs in enterprise config. b/22001019" into mnc-dev 2015-07-06 21:32:52 +00:00
Neil Fuller
4a0a99fd08 am 42070100: am 5df46622: Merge "More tests for LocalSocket"
* commit '42070100bedf08b4d1622403b733abcbcd3b07a1':
  More tests for LocalSocket
2015-07-04 02:58:42 +00:00
Neil Fuller
0fe09fd769 am 6e15462e: am 82a3e51d: Merge "Modify test now that LocalSocket.getSoTimeout() does something"
* commit '6e15462e4b85f7d4b6773ae88d95cfe4a1b8ac2f':
  Modify test now that LocalSocket.getSoTimeout() does something
2015-07-04 02:58:33 +00:00
Neil Fuller
cb57c86657 Fix missing socket closure in LocalSocketTest
Noticed as a result of 8fbc09bde8.
One of the AF_UNIX sockets being created in three tests was not
being closed (until GC/finalization). Because the name is now
used in multiple tests some of the tests would fail in the CTS
test runner ("Address already in use") if no GC had occurred.

Bug: 3106438
Change-Id: I7debe5ed26d9d09e71a3d8a1b5b7d85b13e6e069
2015-07-03 17:45:11 +01:00