Junyu Lai
19a7cda181
Merge "Add CTS to verify NetworkAgent#setLingerDuration" into sc-dev
2021-04-15 03:23:54 +00:00
Lorenzo Colitti
c7048ed83d
Merge "Test ConnectivityManager module-lib APIs for VPNs and blocking." am: f6875cc583 am: 682cb315ee am: fcdf0c2894
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1671528
Change-Id: I1217a2475b0aeb58910570fe3046f0949f41af37
2021-04-14 17:21:44 +00:00
Lorenzo Colitti
52d0924665
Merge "Test ConnectivityManager module-lib APIs for VPNs and blocking." am: f6875cc583 am: 682cb315ee am: ddc265e884
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1671528
Change-Id: I17293cdf47468d634c3a6c26ea1673aa3a799b57
2021-04-14 16:59:58 +00:00
Lorenzo Colitti
fcdf0c2894
Merge "Test ConnectivityManager module-lib APIs for VPNs and blocking." am: f6875cc583 am: 682cb315ee
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1671528
Change-Id: Iaa2d6c4b497eba6a0340094294ba0c6f2ff74f04
2021-04-14 16:10:55 +00:00
Lorenzo Colitti
ddc265e884
Merge "Test ConnectivityManager module-lib APIs for VPNs and blocking." am: f6875cc583 am: 682cb315ee
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1671528
Change-Id: Ib3605afe37ef9ffab8008a187f99816b37c1bad8
2021-04-14 16:10:37 +00:00
Lorenzo Colitti
682cb315ee
Merge "Test ConnectivityManager module-lib APIs for VPNs and blocking." am: f6875cc583
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1671528
Change-Id: I4d3f3c905fde3e9da08df5c3efa203fe570a2407
2021-04-14 15:29:03 +00:00
Lorenzo Colitti
f6875cc583
Merge "Test ConnectivityManager module-lib APIs for VPNs and blocking."
2021-04-14 14:46:29 +00:00
junyulai
cfb2af8659
Add CTS to verify NetworkAgent#setLingerDuration
...
Test: this
Bug: 184227264
Fix: 184796264
Ignore-AOSP-First: prevent merge conflict
Change-Id: I77818685b2bfea499c0294874d205544161677c5
2021-04-14 20:46:20 +08:00
Remi NGUYEN VAN
254ba1512a
Fix proguard rules for Struct in NetworkStack am: 9a82bbf368 am: 9aaeab539b am: 54024858a6
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1674688
Change-Id: I4262236535ec9e1c7ff46ca84723e673647fb3c9
2021-04-14 06:12:25 +00:00
Remi NGUYEN VAN
00ca0671b4
Fix proguard rules for Struct in NetworkStack am: 9a82bbf368 am: 9aaeab539b am: 237561ebdf
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1674688
Change-Id: Id9ea41e2831af5a01e3088dc1d3feca89946c926
2021-04-14 06:11:59 +00:00
Remi NGUYEN VAN
237561ebdf
Fix proguard rules for Struct in NetworkStack am: 9a82bbf368 am: 9aaeab539b
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1674688
Change-Id: I722885350e2514dbf7af5c58602e6b94bd876ff8
2021-04-14 05:45:19 +00:00
Remi NGUYEN VAN
54024858a6
Fix proguard rules for Struct in NetworkStack am: 9a82bbf368 am: 9aaeab539b
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1674688
Change-Id: I815875d909142ae2b1d860a3009daeafad23ab8c
2021-04-14 05:45:19 +00:00
Remi NGUYEN VAN
9aaeab539b
Fix proguard rules for Struct in NetworkStack am: 9a82bbf368
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1674688
Change-Id: I49cf42126e03c4fd449577bd1167dd74dec1b6a5
2021-04-14 05:03:26 +00:00
Remi NGUYEN VAN
9a82bbf368
Fix proguard rules for Struct in NetworkStack
...
All members of the Struct class need to be kept, not just the constructor.
Change-Id: I8705234eb2608c0dfe324c517b8885a93271b6c2
Test: m
2021-04-14 01:30:59 +00:00
Chiachang Wang
9c03e7354f
Merge "Update the method based on API feedback" am: 0a5d964242 am: 80a70a3679 am: e1601cf66f
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1671535
Change-Id: I329efe2b35dd49c9e68b5e2ac2d860627ac456c7
2021-04-13 13:06:43 +00:00
Chiachang Wang
b014b5fdef
Merge "Update the method based on API feedback" am: 0a5d964242 am: 80a70a3679 am: 807d7f2e41
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1671535
Change-Id: I3e3c69bbef95a6a4303a94f69dfa4415bfc1d11c
2021-04-13 13:04:56 +00:00
Chiachang Wang
e1601cf66f
Merge "Update the method based on API feedback" am: 0a5d964242 am: 80a70a3679
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1671535
Change-Id: I59dcbafe7b0f0f9b6d87e69d2e6f3e2276a69ce3
2021-04-13 11:54:57 +00:00
Chiachang Wang
807d7f2e41
Merge "Update the method based on API feedback" am: 0a5d964242 am: 80a70a3679
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1671535
Change-Id: I13071221d470bd633ef8337889b803a388bcab05
2021-04-13 11:54:13 +00:00
Chiachang Wang
80a70a3679
Merge "Update the method based on API feedback" am: 0a5d964242
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1671535
Change-Id: I9d85af6567422f0b5a05173ba58593137cb1181d
2021-04-13 08:51:12 +00:00
Lorenzo Colitti
b84176e9f9
Test ConnectivityManager module-lib APIs for VPNs and blocking.
...
This CL adds tests for:
- ConnectivityManager#setsetLegacyLockdownVpnEnabled
- ConnectivityManager#setRequireVpnForUids
- NetworkCallback#onBlockedStatusChanged(Network, int)
Bug: 165835257
Test: atest CtsNetTestCases:android.net.cts.ConnectivityManagerTest
Change-Id: Ie9b73ec2a1634f3b3a3eb4d21acbe0803b77c70d
2021-04-13 17:30:49 +09:00
Chiachang Wang
0a5d964242
Merge "Update the method based on API feedback"
2021-04-13 08:15:47 +00:00
Paul Hu
247b7233b4
Merge "Replace FIRST_SDK_INT to DEVICE_INITIAL_SDK_INT in Connectivity" into sc-dev
2021-04-13 02:05:21 +00:00
Lorenzo Colitti
36cd857c9e
Fix a tethering crash when a 464xlat upstream disconnects. am: a329e8c984 am: dadc2fe3bb am: 0a250d57b5
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1671533
Change-Id: I92cecaffe32a0d61cf630cd84f95c0857cb226e7
2021-04-12 17:04:20 +00:00
Lorenzo Colitti
a5c6a21b79
Fix a tethering crash when a 464xlat upstream disconnects. am: a329e8c984 am: dadc2fe3bb am: ffc11490ca
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1671533
Change-Id: I1b6408bd3274425de53f04afeaa9b3e79c16c99c
2021-04-12 17:03:54 +00:00
Lorenzo Colitti
ffc11490ca
Fix a tethering crash when a 464xlat upstream disconnects. am: a329e8c984 am: dadc2fe3bb
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1671533
Change-Id: Ia7e17399aa5da6bbb84419ef2d840cf14ee70ea9
2021-04-12 16:15:17 +00:00
Lorenzo Colitti
0a250d57b5
Fix a tethering crash when a 464xlat upstream disconnects. am: a329e8c984 am: dadc2fe3bb
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1671533
Change-Id: I7fa106c720d267c407ea1b9a94b1af8eb02aa1dd
2021-04-12 16:15:06 +00:00
Lorenzo Colitti
dadc2fe3bb
Fix a tethering crash when a 464xlat upstream disconnects. am: a329e8c984
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1671533
Change-Id: I985db044174ea0bb96c8ca588b380f0c11c0c48c
2021-04-12 15:32:50 +00:00
Lorenzo Colitti
a329e8c984
Fix a tethering crash when a 464xlat upstream disconnects.
...
When a 464xlat upstream disconnects, onLinkPropertiesChanged is
called after onLost. This breaks an UpstreamNetworkMonitor
assumption that no callback will ever arrive after onLost.
Bug: 173068192
Fix: 185117377
Test: new unit test
Change-Id: I4ff1eca6d5ed1680ff716c71b683891c8a0e5a77
2021-04-12 15:00:24 +00:00
Chiachang Wang
a31a9b6218
Update the method based on API feedback
...
UserHandle.getUid() is updated to a non-static API based on API
review feedback. Update the usage accordingly.
Bug: 184735865
Test: atest VpnTest
Change-Id: I884f427fae85b2b26973a0315b1ccf3d6f0824c6
2021-04-12 19:35:56 +08:00
paulhu
e0f3796bbb
Replace FIRST_SDK_INT to DEVICE_INITIAL_SDK_INT in Connectivity
...
Replace all FIRST_SDK_INT usage in Connectivity because it has
been renamed to DEVICE_INITIAL_SDK_INT.
Bug: 184735771
Test: m CtsNetTestCases
Ignore-AOSP-First: Some files are differnet between aosp and
sc-dev on frameworkrs/base.
Change-Id: I2f155592b08cdbf259a00b035cacb37ca9847e72
2021-04-12 01:55:33 +00:00
Lorenzo Colitti
e833a4cc63
Merge changes from topic "peruidcallback-cts" am: 65bba3f6bc am: ab98c8119d am: 5ea615e08c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1669609
Change-Id: I56ff93b1d629b94e59d279b96066700703e2db05
2021-04-09 17:32:47 +00:00
Lorenzo Colitti
ad150c460c
Ensure the HostsideVpnTests passes with keyguard locked. am: fd3b95c1f7 am: 16d841048e am: 8a92d39274
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1669608
Change-Id: Ieb31c289e72837bcd602d04a6317c6203402daa0
2021-04-09 17:32:47 +00:00
Lorenzo Colitti
d9096739e3
Add CTS tests for registerDefaultNetworkCallbackAsUid. am: ed26ffe92d am: 6cbdc19b2c am: 2bc9317761
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1669267
Change-Id: I3285145c5ba6466135c7021ed0e9043c69373ec0
2021-04-09 17:32:45 +00:00
Lorenzo Colitti
c7f7f5ada8
Merge changes from topic "peruidcallback-cts" am: 65bba3f6bc am: ab98c8119d am: 89d260c039
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1669609
Change-Id: I0a28ee62a63c4db0494cc51f69ab0b8468401f85
2021-04-09 17:12:08 +00:00
Lorenzo Colitti
a42e82e17f
Ensure the HostsideVpnTests passes with keyguard locked. am: fd3b95c1f7 am: 16d841048e am: a8f8011851
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1669608
Change-Id: I707386cd46c2070762d50254629829173be80510
2021-04-09 17:12:08 +00:00
Lorenzo Colitti
02e2380c8a
Add CTS tests for registerDefaultNetworkCallbackAsUid. am: ed26ffe92d am: 6cbdc19b2c am: 97384c0121
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1669267
Change-Id: If16f7076f47acec463cb288f5a88c0cb7ee6de03
2021-04-09 17:12:07 +00:00
Lorenzo Colitti
5ea615e08c
Merge changes from topic "peruidcallback-cts" am: 65bba3f6bc am: ab98c8119d
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1669609
Change-Id: I556be793ee14d557ee1442287b47c9a1edcaad0d
2021-04-09 16:45:47 +00:00
Lorenzo Colitti
8a92d39274
Ensure the HostsideVpnTests passes with keyguard locked. am: fd3b95c1f7 am: 16d841048e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1669608
Change-Id: I122298ef532c8a41821ead6bb07595e1412ce1e9
2021-04-09 16:45:47 +00:00
Lorenzo Colitti
2bc9317761
Add CTS tests for registerDefaultNetworkCallbackAsUid. am: ed26ffe92d am: 6cbdc19b2c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1669267
Change-Id: Icca5c5a62818ac83910e968dbbadd0610305aa0b
2021-04-09 16:45:46 +00:00
Lorenzo Colitti
89d260c039
Merge changes from topic "peruidcallback-cts" am: 65bba3f6bc am: ab98c8119d
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1669609
Change-Id: Ifbd2f1615f9db9c499edc7d75d2bc3865043e1dc
2021-04-09 16:45:30 +00:00
Lorenzo Colitti
a8f8011851
Ensure the HostsideVpnTests passes with keyguard locked. am: fd3b95c1f7 am: 16d841048e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1669608
Change-Id: I689f8a5e5028069753d377979eee14f97e611681
2021-04-09 16:45:29 +00:00
Lorenzo Colitti
97384c0121
Add CTS tests for registerDefaultNetworkCallbackAsUid. am: ed26ffe92d am: 6cbdc19b2c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1669267
Change-Id: I6983acf968da429a0c036aa7e13a406f27ba7278
2021-04-09 16:45:27 +00:00
Lorenzo Colitti
ab98c8119d
Merge changes from topic "peruidcallback-cts" am: 65bba3f6bc
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1669609
Change-Id: Ic9d3ef957feb979142d7b0adb3ec9525e432eb14
2021-04-09 15:59:16 +00:00
Lorenzo Colitti
16d841048e
Ensure the HostsideVpnTests passes with keyguard locked. am: fd3b95c1f7
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1669608
Change-Id: Idabf4f50d54116d80dc349564bd9ab04cc7fd21a
2021-04-09 15:59:15 +00:00
Lorenzo Colitti
6cbdc19b2c
Add CTS tests for registerDefaultNetworkCallbackAsUid. am: ed26ffe92d
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1669267
Change-Id: Id8d968130a52d419c65a628fb93e47e5ac48c81e
2021-04-09 15:59:13 +00:00
Lorenzo Colitti
65bba3f6bc
Merge changes from topic "peruidcallback-cts"
...
* changes:
Cleanups to VPN hostside tests.
Ensure the HostsideVpnTests passes with keyguard locked.
Add CTS tests for registerDefaultNetworkCallbackAsUid.
2021-04-09 15:16:47 +00:00
TreeHugger Robot
1f3a487326
Merge "Add back platform APIs to HostsideNetworkTestsApp" into sc-dev
2021-04-09 14:41:25 +00:00
junyulai
1bb82d79da
[automerger skipped] Fix NetworkCallback expecting wrong network am: 2e74377464 am: cfd7518bdc am: 2ece9db0de -s ours
...
am skip reason: skip tag Change-Id I2dce6035b13472bbdc2609009d690aac96280033 with SHA-1 bed32ff530 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1657299
Change-Id: I04016f6a01ff50ec00180f0277a0997f3ca0ab6d
2021-04-09 11:21:17 +00:00
junyulai
d92fd2aef5
[automerger skipped] Fix NetworkCallback expecting wrong network am: 2e74377464 am: cfd7518bdc am: 74e03eb201 -s ours
...
am skip reason: skip tag Change-Id I2dce6035b13472bbdc2609009d690aac96280033 with SHA-1 bed32ff530 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1657299
Change-Id: I9f7eccc134467ff3ba31a6b62c95f7735727e943
2021-04-09 11:00:58 +00:00
junyulai
74e03eb201
Fix NetworkCallback expecting wrong network am: 2e74377464 am: cfd7518bdc
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1657299
Change-Id: I4a04b1c4d0e761024a0a7506c7fcf32020413c4b
2021-04-09 09:38:43 +00:00