Merge "Add tests to verify app has network access in onResume." into tm-dev
Sudheer Shanka
authored and
Android (Google) Code Review
commited 2022-04-28 22:00:08 +00:00
fdbffad274
Disable data stall recovery for DnsResolverTest
...
DnsResolverTest#testPrivateDnsBypass is flaky due to data stall recovery
attempting to tear down and reconnect the disconnected connection.
Disable data stall recovery so the test can run without a potential race
condition due to data stall recovery.
Test: atest DnsResolverTest
Bug: 230427128
Change-Id: I3057540d1b261bd51513c568072c8252c5d6959a
Merged-In: I3057540d1b261bd51513c568072c8252c5d6959a
Sarah Chin
authored and
Lorenzo Colitti
commited 2022-04-28 00:03:42 +00:00
53b1174d90
Add tests to verify app has network access in onResume.
...
We already have tests that verify this but these new tests
launch the activity repeatedly a few times and verify the
network access as there are multiple race conditions
involving AMS, NPMS and the app that could result in an
inconsistent network rules state.
Bug: 226299593
Test: atest atest tests/cts/hostside/src/com/android/cts/net/HostsideConnOnActivityStartTest
Change-Id: I6372820fd2b21ebd759a3c44c7280c6699726bde
Merged-In: I6372820fd2b21ebd759a3c44c7280c6699726bde
Sudheer Shanka
commited 2022-04-27 13:23:36 -07:00
fc8ba515da
Merge "Add EthernetTestInterface to list of created interfaces" am: 79b38b491c am: 1591891486
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2063053
Change-Id: I0e010b173550446787e0a438179a29b7b4a79a79
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Treehugger Robot
authored and
Automerger Merge Worker
commited 2022-04-25 11:21:58 +00:00
a83f91ef24
Merge "Add EthernetTestInterface to list of created interfaces" am: 79b38b491c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2063053
Change-Id: I0bf17f837bfbe4e6558781d807509b2014658574
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Treehugger Robot
authored and
Automerger Merge Worker
commited 2022-04-25 11:03:37 +00:00
1591891486
Merge "Add EthernetTestInterface to list of created interfaces"
Treehugger Robot
authored and
Gerrit Code Review
commited 2022-04-25 10:45:07 +00:00
79b38b491c
Merge "Test Ikev2VpnProfile provisioned with IkeTunnelConnectionParams" am: 2e670756ac am: 9942af20c0
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2063922
Change-Id: I966e6dac28759075313774966039097ff033d686
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Chiachang Wang
authored and
Automerger Merge Worker
commited 2022-04-25 09:31:52 +00:00
fe35305b32
Merge "Test Ikev2VpnProfile provisioned with IkeTunnelConnectionParams" am: 2e670756ac
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2063922
Change-Id: I7c324a9abdf0f878e3dda99c28bd4a22cebd4d93
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Chiachang Wang
authored and
Automerger Merge Worker
commited 2022-04-25 09:08:43 +00:00
9942af20c0
Merge "Test Ikev2VpnProfile provisioned with IkeTunnelConnectionParams"
Chiachang Wang
authored and
Gerrit Code Review
commited 2022-04-25 08:44:45 +00:00
2e670756ac
improve mts bpf_existence_test to cover netd/clatd maps and programs in new location am: e9d5ad0b88 am: 89092d5798
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2073978
Change-Id: I5d25eb505b736f8c6bc9156f26f2cb7723f1b33d
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Maciej Żenczykowski
authored and
Automerger Merge Worker
commited 2022-04-24 08:58:14 +00:00
81b51dd582
improve mts bpf_existence_test to cover netd/clatd maps and programs in new location am: e9d5ad0b88
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2073978
Change-Id: I0e8465cbd416221b277e44d28c5dd67a3d0ab77d
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Maciej Żenczykowski
authored and
Automerger Merge Worker
commited 2022-04-24 08:17:31 +00:00
89092d5798
improve mts bpf_existence_test to cover netd/clatd maps and programs in new location
...
Test: TreeHugger, test bpf_existence_test
Bug: 218408035
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I2b183e66d0c4c8750873ae7f0a30b9809e2c8295
Maciej Żenczykowski
commited 2022-04-23 09:20:29 -07:00
e9d5ad0b88
adjust for new T bpfloader net_shared location am: 0736d7bd91 am: 96706b661f
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2071008
Change-Id: Iba57cbfe6f3c41fc7c396098f0caa662d68b1e0e
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Maciej Żenczykowski
authored and
Automerger Merge Worker
commited 2022-04-23 09:56:33 +00:00
4249b8be1d
adjust for new T bpfloader net_shared location am: 0736d7bd91
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2071008
Change-Id: I2adb6923269eb15db881a3adb87ea46841df391e
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Maciej Żenczykowski
authored and
Automerger Merge Worker
commited 2022-04-23 09:36:16 +00:00
96706b661f
adjust for new T bpfloader net_shared location
...
(this is safe because on pre-T none of these maps and programs are mainlined
and thus safe to access from mainline code anyway)
Test: TreeHugger, manual
Bug: 218408035
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I23e565d665247f33e084978890a1ee8ffe0fe568
Maciej Żenczykowski
commited 2022-04-23 09:03:06 +00:00
0736d7bd91
Merge "Update TEST_MAPPING file." am: 8300421bc5 am: fa4f870706
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2056266
Change-Id: Id97414ab712cd4a7a0fcc9d7404bc2e9f78224c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Sudheer Shanka
authored and
Automerger Merge Worker
commited 2022-04-21 18:24:27 +00:00
237caa4170
Merge "Update TEST_MAPPING file." am: 8300421bc5
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2056266
Change-Id: I1e216217370bee0f12a824bece1ac49d1a62e526
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Sudheer Shanka
authored and
Automerger Merge Worker
commited 2022-04-21 17:51:58 +00:00
fa4f870706
Merge "Update TEST_MAPPING file."
Sudheer Shanka
authored and
Gerrit Code Review
commited 2022-04-21 17:27:38 +00:00
8300421bc5
Merge "[CLATJ#27] Use ClatdCoordinator since T+ devices" am: b4bf6cea38 am: 8d75a93995
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1951099
Change-Id: I3878e5359349d8195e8741ea69ae437edab68909
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Maciej Żenczykowski
authored and
Automerger Merge Worker
commited 2022-04-21 14:34:12 +00:00
2fadc5413c
Merge "[CLATJ#27] Use ClatdCoordinator since T+ devices" am: b4bf6cea38
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1951099
Change-Id: I4de5e5b28ce961bcf84f03210585de8dbaefd256
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Maciej Żenczykowski
authored and
Automerger Merge Worker
commited 2022-04-21 14:04:40 +00:00
8d75a93995
Merge "[CLATJ#27] Use ClatdCoordinator since T+ devices"
Maciej Żenczykowski
authored and
Gerrit Code Review
commited 2022-04-21 14:00:23 +00:00
b4bf6cea38
Merge "[SettingsProvider] fix connectivity test" am: 5e64a14ccf am: bb015ef2af
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2065731
Change-Id: I9aa9ec8377a4fefc687a1282168ed1cb6e47277e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Treehugger Robot
authored and
Automerger Merge Worker
commited 2022-04-21 13:33:54 +00:00
90d41149b3
Merge "[SettingsProvider] fix connectivity test" am: 5e64a14ccf
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2065731
Change-Id: If61c289b6b66521cb8ca6df442697904f25cd7c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Treehugger Robot
authored and
Automerger Merge Worker
commited 2022-04-21 13:09:47 +00:00
bb015ef2af
Merge "[SettingsProvider] fix connectivity test"
Treehugger Robot
authored and
Gerrit Code Review
commited 2022-04-21 12:41:49 +00:00
5e64a14ccf
Test Ikev2VpnProfile provisioned with IkeTunnelConnectionParams
...
Bug: 223841137
Test: atest CtsNetTestCases FrameworksNetTests
Change-Id: I683f6242e4ed4a469893e3a17fe7b479a7a768e5
chiachangwang
commited 2022-04-21 14:49:41 +08:00
476e2a08bf
[CLATJ#27] Use ClatdCoordinator since T+ devices
...
- For clatd start and stop, use ClatdCoordinator on T+ and Netd on S-
- Fix the unit test for T+ and S- devices
Note that mokito.verify(.., times(1)) is replaced by verify(..)
because times(1) is the default and can be omitted.
See verify in mockito/src/main/java/org/mockito/Mockito.java
Note that this commit needs to be merged with aosp/1956072.
Bug: 212345928
Test: atest FrameworksNetTests
manual test
1. Connect to ipv6-only wifi.
2. Try IPv4 traffic.
$ ping 8.8.8.8
3. Check bpf entries are added
4. Disconnect from ipv6-only wifi.
5. Check bpf entries are removed
6. testipv4.com shows 10/10
Change-Id: I7dfda6eec19de94e4258971effcd8a1210542473
Hungming Chen
commited 2022-04-21 13:24:36 +08:00
eb15a2d816
Merge "Deflake testStartStopVpnProfileV6 and testStartStopVpnProfileV4" am: b458c41700 am: 5348b24f7d
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2063545
Change-Id: I2c18752f7e15e1754f1519b2eeffeb5978611c4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Chiachang Wang
authored and
Automerger Merge Worker
commited 2022-04-21 04:57:55 +00:00
ed4c494b8c
Merge "Deflake testStartStopVpnProfileV6 and testStartStopVpnProfileV4" am: b458c41700
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2063545
Change-Id: I1bf6f37dd8e0bc846d7646ca55fa733daf359235
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Chiachang Wang
authored and
Automerger Merge Worker
commited 2022-04-21 04:41:36 +00:00
5348b24f7d
Merge "Deflake testStartStopVpnProfileV6 and testStartStopVpnProfileV4"
Chiachang Wang
authored and
Gerrit Code Review
commited 2022-04-21 03:44:45 +00:00
b458c41700
Merge "ConnectivityNativeBinderTest: Check Kernel Version" am: 76ff404153 am: 100fa4f809
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2068647
Change-Id: I12d1d29e7e6b9f4e83b738d40a692fd055ff8892
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Lorenzo Colitti
authored and
Automerger Merge Worker
commited 2022-04-21 00:35:05 +00:00
397cddd3c5
Merge "ConnectivityNativeBinderTest: Check Kernel Version" am: 76ff404153
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2068647
Change-Id: I4ea413a038aca1a4ab9704153bf2d9c8fa75bdcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Lorenzo Colitti
authored and
Automerger Merge Worker
commited 2022-04-21 00:19:45 +00:00
100fa4f809
Merge "ConnectivityNativeBinderTest: Check Kernel Version"
Lorenzo Colitti
authored and
Gerrit Code Review
commited 2022-04-21 00:00:14 +00:00
76ff404153
[SettingsProvider] fix connectivity test
...
TestOnly flag allows the test to read restricted @Readable setting
ALWAYS_ON_VPN_LOCKDOWN_WHITELIST.
BUG: 177239688
Test: atest com.android.server.ConnectivityServiceTest
Change-Id: If41708ad31de9cec3a102b4de4d237e96a448ef1
Songchun Fan
commited 2022-04-20 09:29:40 -07:00
0cb706a0f4
Merge "Verify the return value of scheduleJob()." am: a4ea04d869 am: 320e5bac0c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2068029
Change-Id: Ib3702f52dba4938aecaf7f704376e278b41b7735
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Treehugger Robot
authored and
Automerger Merge Worker
commited 2022-04-20 06:13:43 +00:00
a58b047665
Merge "Reduce BROADCAST_TIMEOUT_MS." am: 74d7554c55 am: 5608cf353d
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2068030
Change-Id: I2ef767d8976c018c9a346c33121500f78bc4690c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Sudheer Shanka
authored and
Automerger Merge Worker
commited 2022-04-20 06:13:34 +00:00
cc86cb81db
Merge "Fix NullPointerException happens in dumpCheckin" am: 6b7e457988 am: 44a02af11a am: a4d60dd2ad
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2059628
Change-Id: If9933b6aad05abf79e85f9172ba6eb6f8492d648
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Aaron Huang
authored and
Automerger Merge Worker
commited 2022-04-20 06:12:50 +00:00
d79f543df0
Merge "Verify the return value of scheduleJob()." am: a4ea04d869
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2068029
Change-Id: I552a5d7c1dd22c331bcf688243d63fa2723bc615
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Treehugger Robot
authored and
Automerger Merge Worker
commited 2022-04-20 03:28:27 +00:00
320e5bac0c
Merge "Verify the return value of scheduleJob()."
Treehugger Robot
authored and
Gerrit Code Review
commited 2022-04-20 03:07:37 +00:00
a4ea04d869
ConnectivityNativeBinderTest: Check Kernel Version
...
Check kernel version in patch before running test case
to make sure that 5.4 kernel is used which is what the
bpf prog uses.
Bug: 229692536
Test: atest ConnectivityNativeBinderTest
Change-Id: I3bf8d3ce6c6a64236da2e4f039fb13a98231fae0
Tyler Wear
commited 2022-04-19 18:01:17 -07:00
4e7acedf15
Merge "Reduce BROADCAST_TIMEOUT_MS." am: 74d7554c55
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2068030
Change-Id: Ie16f7c319686afbe55d6e7ee50cb4fdab8335fe6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Sudheer Shanka
authored and
Automerger Merge Worker
commited 2022-04-20 00:54:06 +00:00
5608cf353d
Merge "Reduce BROADCAST_TIMEOUT_MS."
Sudheer Shanka
authored and
Gerrit Code Review
commited 2022-04-20 00:34:57 +00:00
74d7554c55
Reduce BROADCAST_TIMEOUT_MS.
...
We wait for a few seconds before verifying the
test app didn't receive a broadcast because it
is possible the broadcast was just delayed but
we don't necessarily have to wait for too long.
Bug: 201580811
Test: atest com.android.cts.net.HostsideRestrictBackgroundNetworkTests
Change-Id: Ie5550742c506753fc994209d4db760c1ee73a2cb
Sudheer Shanka
commited 2022-04-19 14:32:19 -07:00
8526459c86
Verify the return value of scheduleJob().
...
Bug: 228117528
Test: atest com.android.cts.net.HostsideRestrictBackgroundNetworkTests
Change-Id: Ia860a5d68f2661476cf983fe8e4a428c208e5559
Sudheer Shanka
commited 2022-04-19 14:04:21 -07:00
a60493ed81
Merge "Fix NullPointerException happens in dumpCheckin" am: 6b7e457988
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2059628
Change-Id: Ib5a45d7134924cc78f1c2717af07d17e1fad53fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Aaron Huang
authored and
Automerger Merge Worker
commited 2022-04-19 12:04:23 +00:00
2a31dce8f5
Merge "Fix NullPointerException happens in dumpCheckin"
Aaron Huang
authored and
Gerrit Code Review
commited 2022-04-19 11:43:21 +00:00
6b7e457988
Deflake testStartStopVpnProfileV6 and testStartStopVpnProfileV4
...
The tests expect to receive network validated callback on VPN
network in S and below. However, there is a platform bug that
VPN may misuse VPN network itself as the underlying network,
and cause VPN reconnect. If this race happens before validation
completed and callback sent, the test will fail to get the
validated network callback.
Restrict the validated capabilities check in T+ only devices
which contain the necessary fixes.
Also, unreigster the callback at the end of the test.
Bug: 228790797
Test: atest android.net.cts.Ikev2VpnTest
Change-Id: Id0ae0f983f989bfde5df2481e0d529bc5a140a7d
chiachangwang
commited 2022-04-19 19:32:35 +08:00
0366028f64
Fix permission bypass problem for Tethering deprecated APIs
...
Since the tethering functions in ConnectivityService is delegated
to TetheringManager instance and get caches informataion in
TetheringManager without checking ACCESS_NETWORK_STATE permission.
If application use reflection call getTetherXXX functions in
ConnectivityService, it can get tethering status with no additional
execution privileges needed.
Bug: 162952629
Test: manual
Ignore-AOSP-First: security fix
Change-Id: I5b897f216db19fead6ba6ac07915aa0f6ff5bf42
markchien
commited 2022-04-19 19:13:10 +08:00
28160b3141
Fix NullPointerException happens in dumpCheckin
...
Currently dumpCheckin passes a null object to create
the contructor of NetworkStatsCollection.Key but the
constructor requires non-null object. Thus, it caused
the NPE in dumpCheckin. To fix this exception, create
an NetworkIdentitySet() object instead of using an
null object.
Bug: 225131008
Bug: 226539404
Test: dumpsys netstats --checkin is fine
FrameworksNetTests
Change-Id: I7f2dadf0647b3f42e0f667d96291d2ae37e23faf
Aaron Huang
commited 2022-04-19 17:49:30 +08:00
c3a43b4063
Merge "Fix CtsNetTestCases on Q" am: d651629b14 am: 5b658859b8
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2063742
Change-Id: Id112fcddada866c596a2847c0f5b51700421d20d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Remi NGUYEN VAN
authored and
Automerger Merge Worker
commited 2022-04-18 03:56:42 +00:00
9cfcbdf56f
Merge "Fix CtsNetTestCases on Q" am: d651629b14
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2063742
Change-Id: I8c438027ca73d3909d448f774ebd109cfc2b4c72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Remi NGUYEN VAN
authored and
Automerger Merge Worker
commited 2022-04-18 03:31:08 +00:00
5b658859b8