Commit Graph

2762 Commits

Author SHA1 Message Date
Treehugger Robot
afa18f0256 Merge "Fix CTS test failed on R device" 2021-02-22 10:37:29 +00:00
Treehugger Robot
f754671f07 Merge "Add MUTABLE flag when creating PendingIntent" 2021-02-22 10:29:31 +00:00
Treehugger Robot
2108eada65 Merge "Fix flaky test by extending timeout" 2021-02-22 07:58:10 +00:00
junyulai
62f5117bfd Add MUTABLE flag when creating PendingIntent
By the new feature introduced in next Android release.
Any PendingIntent needs to be specified about the mutability.

While ConnectivityService would put extra info such as
network or request id before broadcasting the inner intent.
The MUTABLE flag needs to be added accordingly.

Test: this
Fix: 178121691
Change-Id: I87d0efaf51a91556ef9f8e18db38803e4861cfd7
2021-02-22 15:06:32 +08:00
junyulai
e26bbf8032 Fix CTS test failed on R device
The test failed since the API is not available on R device.
Add conditions to ignore it.

Test: atest CtsNetTestCasesLatestSdk:android.net.cts.ConnectivityManagerTest
Bug: None
Change-Id: I3cbc623a84f7313e1155fe83a44ebef042a04076
2021-02-22 14:26:27 +08:00
junyulai
607985b57f Fix flaky test by extending timeout
The asserted capabilities change callback event took 170ms
in average to fire on cuttlefish, which causes 35% of
flakiness since the event might delay up to 500ms in practice.
Extend to 30s timeout value which is the standard value
of waiting for network callback events in CTS.

This change also ignore the test up to Android R since the API
is not available for R devices or below.

Test: atest CtsNetTestCases:android.net.cts.ConnectivityManagerTest#testRequestBackgroundNetwork \
      --rerun-until-failure 500
Test: atest CtsNetTestCasesLatestSdk:android.net.cts.ConnectivityManagerTest
      on R device
Bug: 179694867

Change-Id: Ic5e11d4a4f326150848bc48038fa01cde39f7661
2021-02-22 14:26:05 +08:00
Bob Badour
cfaae9a3b2 Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/modules/Connectivity" am: f5b346ed1d am: c384c677ef am: a3f610a7b2
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1587901

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I51b1e86a8740ca95a948c1cf1d8bc0bbd48bce88
2021-02-21 19:04:24 +00:00
junyulai
651a95f126 [VCN07.1] Add test for bypassing VCN for non-internet request
This is a re-upload that combines aosp/1550755 and aosp/1579872.

Test: atest NetworkRequestTest#testBypassingVcnForNonInternetRequest
Test: atest CtsNetTestCasesLatestSdk on R device
Bug: 175662146
Change-Id: I2fdc2418339bef30c9f816d63418bba218abf4a1
2021-02-20 19:22:25 +08:00
Bob Badour
f5b346ed1d Merge "[LSC] Add LOCAL_LICENSE_KINDS to packages/modules/Connectivity" 2021-02-19 06:23:22 +00:00
Sudheer Shanka
cc95bc9d32 Merge "Add TEST_MAPPING to run CtsHostsideNetworkTests in presubmit." am: ddcfa071ab am: cccaa598fc am: 970f6836ce
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1538986

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id24816d62219e23f0f0109019f84d79effa8ae11
2021-02-19 03:05:41 +00:00
Sudheer Shanka
ddcfa071ab Merge "Add TEST_MAPPING to run CtsHostsideNetworkTests in presubmit." 2021-02-19 00:33:15 +00:00
Remi NGUYEN VAN
e817bee583 Merge "Deflake CaptivePortalTest mobile data usage" am: 1a16358c36 am: 9b5f78886d am: 0e251f7a8e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1593857

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id5cdde3f25901ee56165bd8950ce8bbb428a46dc
2021-02-18 15:48:20 +00:00
Remi NGUYEN VAN
1a16358c36 Merge "Deflake CaptivePortalTest mobile data usage" 2021-02-18 13:11:25 +00:00
Sudheer Shanka
be82d7d77a Add TEST_MAPPING to run CtsHostsideNetworkTests in presubmit.
We already run these tests when platform code affecting these tests
change. Now enabling these too to also run when these tests are being
changed.

Fixes: 154344933
Test: atest --test-mapping packages/modules/Connectivity/tests/cts/hostside
Change-Id: Ie3ea67670ccd028815936d30189146c25ba87e28
2021-02-18 11:39:09 +00:00
Remi NGUYEN VAN
6d190abfe2 Deflake CaptivePortalTest mobile data usage
The test did not verify that mobile networks were validated before
starting, which could cause them to validate during the test and pick up
the test URLs. Verify that mobile data is validated before the test.

Also shorten test URL expiration, so in case of hard-interrupt of the
test (without calling tearDown) it does not affect other tests for a
long time.

Bug: 178630586
Test: atest CtsNetTestCases
Change-Id: I03f346bcc231f869f50ca9c7e84bfac319bcc871
2021-02-18 18:36:34 +09:00
Remi NGUYEN VAN
54ff562243 Merge "Skip NetworkAgentTest via its runner on R-" am: 561c31906e am: 22bcc4a1cb am: c9877f1959
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1553861

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If6915c854b6c79e27e9d8ba6079df8d9cf70883e
2021-02-18 02:52:21 +00:00
Remi NGUYEN VAN
561c31906e Merge "Skip NetworkAgentTest via its runner on R-" 2021-02-18 01:30:58 +00:00
Bob Badour
97e6be27f6 [LSC] Add LOCAL_LICENSE_KINDS to packages/modules/Connectivity
Added SPDX-license-identifier-Apache-2.0 to:
  Tethering/Android.bp
  Tethering/apex/Android.bp
  Tethering/bpf_progs/Android.bp
  Tethering/common/TetheringLib/Android.bp
  Tethering/tests/Android.bp
  Tethering/tests/integration/Android.bp
  Tethering/tests/mts/Android.bp
  Tethering/tests/privileged/Android.bp
  Tethering/tests/unit/Android.bp
  tests/cts/hostside/Android.bp
  tests/cts/hostside/aidl/Android.bp
  tests/cts/hostside/app/Android.bp
  tests/cts/hostside/app2/Android.bp
  tests/cts/hostside/certs/Android.bp
  tests/cts/net/Android.bp
  tests/cts/net/api23Test/Android.bp
  tests/cts/net/appForApi23/Android.bp
  tests/cts/net/jni/Android.bp
  tests/cts/net/native/dns/Android.bp
  tests/cts/net/native/qtaguid/Android.bp
  tests/cts/net/util/Android.bp
  tests/cts/tethering/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I8534c580f0e2a17be146300b67b3604817b64507
2021-02-16 04:09:58 -08:00
Remi NGUYEN VAN
fec1dba7c6 Merge changes from topic "revert-1579872-vcn07-WIQQMUVMTJ" am: edc9b873d3 am: e051a098ab am: 002dd263d7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1585571

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I40cac7a7ae9e024cc80a6d2faa524c50fcef2a30
2021-02-16 02:23:52 +00:00
Remi NGUYEN VAN
cddf067d2c Revert "Address comments on aosp/1550755" am: f77bed6d95 am: 01218f193f am: e4ebb44543
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1585570

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If637d51fc7cd0109b39f8ea8c8eee8e6705584af
2021-02-16 02:23:51 +00:00
Remi NGUYEN VAN
075da46909 Revert "[VCN07.1] Add test for bypassing VCN for non-internet re..."
Revert "[VCN07] Bypass VCN for non-internet app accessible cellu..."

Revert submission 1579872-vcn07

Reason for revert: Possible culprit for b/179768816, broken ConnectivityControllerTest
Reverted Changes:
Id09b19c13:Address comments on aosp/1550755
I245bd69e0:[VCN07.1] Add test for bypassing VCN for non-inter...
I9936894b9:[VCN07] Bypass VCN for non-internet app accessible...

Change-Id: I7902a221c8597427e48d3e32fa5668b9c1a47420
2021-02-12 06:28:17 +00:00
Remi NGUYEN VAN
f77bed6d95 Revert "Address comments on aosp/1550755"
Revert "[VCN07] Bypass VCN for non-internet app accessible cellu..."

Revert submission 1579872-vcn07

Reason for revert: Possible culprit for b/179768816, broken ConnectivityControllerTest
Reverted Changes:
Id09b19c13:Address comments on aosp/1550755
I245bd69e0:[VCN07.1] Add test for bypassing VCN for non-inter...
I9936894b9:[VCN07] Bypass VCN for non-internet app accessible...

Change-Id: I3fded28691e05a3dbf25bb7361c72acaa61b29c7
2021-02-12 06:27:44 +00:00
Lorenzo Colitti
a299ac8d82 Merge changes I71a37663,Ib2010b38 am: fd710547b2 am: c241c0f4f3 am: c2717c6242
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1583023

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib6106bebb2ef3b816374b8652b46d91769a3c716
2021-02-12 06:13:46 +00:00
Lorenzo Colitti
fd710547b2 Merge changes I71a37663,Ib2010b38
* changes:
  Improve testing of registerSystemDefaultNetworkCallback.
  Remove buggy ConnectivityManagerTest#ensureWifiConnected.
2021-02-12 02:45:02 +00:00
Daulet Zhanguzin
c5fe5ef9b7 Merge "Run Connectivity cts tests against unbundled version of BouncyCastle" am: e1f96f3c35 am: c9bee74abd am: 66d9e9aa2c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1580048

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1d65896c29feb6297f9bbb0e36872a2b28240a91
2021-02-11 16:16:10 +00:00
Daulet Zhanguzin
e1f96f3c35 Merge "Run Connectivity cts tests against unbundled version of BouncyCastle" 2021-02-11 14:44:06 +00:00
Sudheer Shanka
37c10a2252 Update the way we change meteredness of cellular networks in tests.
SubscriptionManager.setSubscriptionOverrideUnmetered() has been updated
to add NET_CAPABILITY_TEMPORARILY_NOT_METERED instead of
NET_CAPABILITY_NOT_METERED. So, we can't rely on that for changing the
meteredness.

Bug: 179664982
Test: atest tests/cts/hostside/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
Test: atest tests/cts/hostside/src/com/android/cts/net/HostsideNetworkCallbackTests.java
Change-Id: I4163b2f9c6f80b4e639d9977ef7e2b444ab12e81
Merged-In: I4163b2f9c6f80b4e639d9977ef7e2b444ab12e81
2021-02-10 14:05:09 +00:00
Lorenzo Colitti
baea700554 Improve testing of registerSystemDefaultNetworkCallback.
Addresses comments on aosp/1570840.

Bug: 179774433
Test: test-only change
Change-Id: I71a376631503e5b50ada3f7bb3dca6dbae9ebc27
2021-02-10 22:41:48 +09:00
Sudheer Shanka
384e7c2a45 Merge "Update the way we change meteredness of cellular networks in tests." into sc-dev 2021-02-10 13:13:40 +00:00
Lorenzo Colitti
789e771b3c Merge changes from topics "vpnmove-getconnectionowneruid", "vpnmove-systemdefaultcallback", "vpnmove-vpntransportinfo" am: 43b96c711b am: 2d109b3909 am: f5d2df925e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1574260

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia3fe3f69dc9d85d048767bef113413c412898741
2021-02-10 07:46:18 +00:00
Lorenzo Colitti
50e994aae5 Add CTS coverage for VpnTransportInfo. am: e9aeb3c1c5 am: fc5b95502b am: eb54554df9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1570841

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia72203b97fe7d75268160c54b247fb39acf17355
2021-02-10 07:46:16 +00:00
Lorenzo Colitti
9b446b90d6 Add test coverage for registerSystemDefaultNetworkCallback. am: 1e5cdd3187 am: 1f40096f3e am: c49cba3526
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1570840

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I09f367980efec9969e8b8b711757fd2909189e24
2021-02-10 07:46:14 +00:00
Lorenzo Colitti
bf5c2979dd Remove buggy ConnectivityManagerTest#ensureWifiConnected.
This method does not behave correctly when wifi is connected but
the last CONNECTIVITY_ACTION broadcast was not for wifi. This
could happen due to another network connecting or disconnecting,
such as VPN.

Bug: 179774433
Test: test-only change
Change-Id: Ib2010b3871133c38b6d508bf508134dd9b814ce2
2021-02-10 15:58:18 +09:00
Lorenzo Colitti
98d23e7d02 Accept both pre-S and post-S errors in getConnectionOwnerUid.
On R and below, when an app that is not the active VPN app calls
getConnectionOwnerUid, a SecurityException is thrown. On S and
above, the method just returns INVALID_UID, which is what would
happen if the app was the active VPN app but was not authorized
to find that particular socket.

Accept both behaviours.

Bug: 173331190
Test: atest HostsideVpnTests#testGetConnectionOwnerUidSecurity passes on R and S
Change-Id: Ie6de2ef505b0d7bc253c55215a698aeaa210785c
2021-02-10 15:14:31 +09:00
Lorenzo Colitti
e9aeb3c1c5 Add CTS coverage for VpnTransportInfo.
Bug: 173331190
Test: FrameworksNetTests HostsideVpnTests CtsNetTestCases
Change-Id: I77d866270c63f1078a2a01941b2271d4338aa178
2021-02-10 15:14:26 +09:00
Sudheer Shanka
2ca64d3c31 Update the way we change meteredness of cellular networks in tests.
SubscriptionManager.setSubscriptionOverrideUnmetered() has been updated
to add NET_CAPABILITY_TEMPORARILY_NOT_METERED instead of
NET_CAPABILITY_NOT_METERED. So, we can't rely on that for changing the
meteredness.

Bug: 179664982
Test: atest tests/cts/hostside/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
Test: atest tests/cts/hostside/src/com/android/cts/net/HostsideNetworkCallbackTests.java
Ignore-AOSP-First: Handling merge-conflict
Change-Id: I4163b2f9c6f80b4e639d9977ef7e2b444ab12e81
2021-02-10 04:57:48 +00:00
Daulet Zhanguzin
8b4a865266 Run Connectivity cts tests against unbundled version of BouncyCastle
Bug: 154796679
Test: Treehugger
Change-Id: I594c3ce3808735427aed2899f3805dfacb117516
2021-02-09 14:03:01 +00:00
Lorenzo Colitti
1e5cdd3187 Add test coverage for registerSystemDefaultNetworkCallback.
Bug: 173331190
Test: atest CtsNetTestCases:NetworkAgentTest
Change-Id: I3ce51ca253a8bd06408137f6f9ed4056a832cb43
2021-02-09 20:10:36 +09:00
Treehugger Robot
acf3792680 Merge "Temporarily disable flaky testRequestBackgroundNetwork CTS test" am: 1259762383 am: 81d26e80ed am: 189842e956
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1579874

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I41eaa4e3d419298b70c8e17b01043342f7ac0769
2021-02-09 03:18:46 +00:00
Treehugger Robot
1259762383 Merge "Temporarily disable flaky testRequestBackgroundNetwork CTS test" 2021-02-09 00:13:46 +00:00
Junyu Lai
eae05b4583 Merge changes from topic "vcn07" am: 438f787ca3 am: dfb0a4ffc0 am: 8d02b4ad8c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1579872

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie8cabe55144533c15be90895d416b129eb3c9c75
2021-02-08 22:37:06 +00:00
Junyu Lai
438f787ca3 Merge changes from topic "vcn07"
* changes:
  Address comments on aosp/1550755
  [VCN07.1] Add test for bypassing VCN for non-internet request
2021-02-08 21:40:09 +00:00
junyulai
349deb8e15 Temporarily disable flaky testRequestBackgroundNetwork CTS test
Test: TH
Bug: 179554972
Change-Id: If82d561231b74e8cd0d220431ac83d08e8f16cdd
2021-02-08 21:48:13 +08:00
junyulai
5ceb5c3c8f Address comments on aosp/1550755
This CL bypass adding NOT_VCN_MANAGED on R device. And add TODOs
for refactoring and adding test coverage.

Test: atest CtsNetTestCasesLatestSdk:NetworkRequestTest on R device
Bug: 175662146

Change-Id: Id09b19c13f9a74e25d45689d2211418172dfaec8
2021-02-08 08:52:28 +00:00
Sudheer Shanka
8247993e00 Update meteredness of cellular networks for tests.
This would allow us to run both metered and unmetered networkpolicy
related tests when the device is on a cellular network.

Bug: 165343126
Test: atest CtsHostsideNetworkTests:HostsideRestrictBackgroundNetworkTests
Test: atest CtsHostsideNetworkTests:HostsideNetworkCallbackTests
Change-Id: Id70856dffc920e74bda28583dba4dd851a832397
Merged-In: Id70856dffc920e74bda28583dba4dd851a832397
2021-02-07 23:29:08 +00:00
Sudheer Shanka
48cf7f07a4 Merge "Update meteredness of cellular networks for tests." into sc-dev 2021-02-07 19:08:50 +00:00
Sudheer Shanka
9e441af03a Update meteredness of cellular networks for tests.
This would allow us to run both metered and unmetered networkpolicy
related tests when the device is on a cellular network.

Bug: 165343126
Test: atest CtsHostsideNetworkTests:HostsideRestrictBackgroundNetworkTests
Test: atest CtsHostsideNetworkTests:HostsideNetworkCallbackTests
Ignore-AOSP-First: Handling merge-conflict
Change-Id: Id70856dffc920e74bda28583dba4dd851a832397
2021-02-05 07:11:23 +00:00
junyulai
ea79aa6fd9 [VCN07.1] Add test for bypassing VCN for non-internet request
Test: atest NetworkRequestTest#testBypassingVcnForNonInternetRequest
Bug: 175662146
Change-Id: I245bd69e02866d3608ab1667b665f6e12860037b
2021-02-05 10:09:09 +08:00
Junyu Lai
e2ab8d52f3 Merge "[VCN06.1] Add CTS for request background network" am: fa8d845a6e am: abae927467 am: 0519dd2437
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1553867

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If4fc62fc58d55f3151bd18a646b34f5041a2354b
2021-01-29 23:36:41 +00:00
Junyu Lai
38b5855ff7 [VCN06.1] Add CTS for request background network
Test: android.net.cts.ConnectivityManagerTest#testRequestBackgroundNetwork
Bug: 175662146

Change-Id: Icd7d2bc18c4b328291e96fc3f18828d0421f5b6e
2021-01-29 14:34:38 +08:00