Lorenzo Colitti
2583e758e4
Mark most VpnServiceTest methods as @AppModeFull. am: 60b26ee453 am: f7ff930e3a
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1648190
Change-Id: I3fe91bf6dd3c451aa01fbd5fcc290e8125adc43b
2021-03-22 19:12:34 +00:00
Lorenzo Colitti
f7ff930e3a
Mark most VpnServiceTest methods as @AppModeFull. am: 60b26ee453
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1648190
Change-Id: I6fcb53be747a5e95d58f2d84b16214cf9607a3d0
2021-03-22 15:29:05 +00:00
Lorenzo Colitti
60b26ee453
Mark most VpnServiceTest methods as @AppModeFull.
...
In S, instant apps can no longer access the system service that
backs the VPN APIs, so these tests started to fail in instant
mode.
Regardless of that change in S, though, instant apps cannot
create VPNs because they cannot access the package manager.
Previously, the tests were only passing because they did not
check that the VPN would actually work, they only checked that
the VPN API calls failed.
Fix: 181575083
Test: atest --instant CtsNetTestCases:VpnServiceTest
Change-Id: Idd35051bd1c908a8b85c02e8d0c54d3dea2dde38
2021-03-22 13:16:02 +00:00
Treehugger Robot
c4d114ad6f
[automerger skipped] Merge "Revert^2 "Replace the usage of UidRange"" am: bf0c19e52f -s ours am: 1baa39f7b1 -s ours
...
am skip reason: skip tag Change-Id I4bc0daf5ad9e4b4043f4a897ddab16aec8f8a536 with SHA-1 c1f14634a4 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1646849
Change-Id: I169190c331866089d76ba64faebc309dae827239
2021-03-21 17:27:12 +00:00
Remi NGUYEN VAN
ddd1a6b40a
Move connectivity AIDLs to android.net am: cc305b2fa5 am: 1feb0c3076
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1596432
Change-Id: Ifd637a65600cc1185d27b15e486fcaeb83b244db
2021-03-21 17:26:59 +00:00
Treehugger Robot
1baa39f7b1
[automerger skipped] Merge "Revert^2 "Replace the usage of UidRange"" am: bf0c19e52f -s ours
...
am skip reason: skip tag Change-Id I4bc0daf5ad9e4b4043f4a897ddab16aec8f8a536 with SHA-1 c1f14634a4 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1646849
Change-Id: Id633ed17067ec06bb2a296d9e6c07a11db47978b
2021-03-21 16:55:29 +00:00
Treehugger Robot
bf0c19e52f
Merge "Revert^2 "Replace the usage of UidRange""
2021-03-21 16:41:13 +00:00
Remi NGUYEN VAN
1feb0c3076
Move connectivity AIDLs to android.net am: cc305b2fa5
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1596432
Change-Id: I5825db16d1fc8f41f8ec99eb08fae550aed2cbc9
2021-03-21 16:37:03 +00:00
Remi NGUYEN VAN
cc305b2fa5
Move connectivity AIDLs to android.net
...
java_sdk_libraries and apexes need to contain bootclasspath classes
under predefined packages. Tethering currently uses android.net, so make
sure all the connectivity bootclasspath classes are under android.net.
This avoids maintaining two packages for the tethering APEX, where
com.android.connectivity.aidl is only used by internal AIDL files.
Bug: 182984842
Test: m
Change-Id: I23feb26c5de2fd7a4177797a3bc1d0dcbef4ade7
Merged-In: I23feb26c5de2fd7a4177797a3bc1d0dcbef4ade7
2021-03-20 22:24:08 +09:00
Maciej Żenczykowski
b40575e832
bpf_progs - remove unused dependencies am: b1ffd2ce9b am: 2f780deb38
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1646235
Change-Id: I3b51769d1bb88d5febc1800d93cd7fcc6f6c13b3
2021-03-19 09:57:58 +00:00
Maciej Żenczykowski
2f780deb38
bpf_progs - remove unused dependencies am: b1ffd2ce9b
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1646235
Change-Id: I36ee32c100eeb1f0fb89ea13fcb3c0b8c0869259
2021-03-19 09:38:40 +00:00
Maciej Żenczykowski
b1ffd2ce9b
bpf_progs - remove unused dependencies
...
Test: builds, atest, TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com >
Change-Id: I9414bde566bb73b696593587db854de3fb14cdcc
2021-03-19 03:39:42 +00:00
Chiachang Wang
2fb0846d70
Revert^2 "Replace the usage of UidRange"
...
274c796731
The parameter of NetworkCapabilities.setUids() and
NetworkRequest.Builder.setUids() are updated to take a set of
integer Range instead of a set of UidRange because of refactor
work for the incoming connectivity mainline module.
The parameter change stops NetworkRequestTest to work in the
different API levels. Replace the usage with shims to work in
both current and stable APIs.
Bug: 172183305
Test: atest FrameworksNetTests CtsNetTestCasesLatestSdk
Change-Id: I7d18402f051051371f3054f6897b05b6da072105
Merged-In: I4bc0daf5ad9e4b4043f4a897ddab16aec8f8a536
2021-03-19 02:10:06 +00:00
Maciej Żenczykowski
cfd48295b3
Merge changes Ibe325714,I44f3dc9e am: 63be468bf4 am: 3828871130
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1644628
Change-Id: I456582e52c4991fb5e1c53e772ef14621d5434d6
2021-03-18 22:42:04 +00:00
Maciej Żenczykowski
3828871130
Merge changes Ibe325714,I44f3dc9e am: 63be468bf4
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1644628
Change-Id: Ic9317d85c0a8ea637dbc626b704ef354fc9e295f
2021-03-18 22:05:58 +00:00
Maciej Żenczykowski
63be468bf4
Merge changes Ibe325714,I44f3dc9e
...
* changes:
fix whitespace in offload.c macro
change PRIO_CLAT into a comment
2021-03-18 19:53:24 +00:00
Anthony Stange
abc4b59c47
Merge "Revert "Replace the usage of UidRange"" am: 83f77d83fd am: 0f97255402
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1645769
Change-Id: I86886953ab47f4d176b11d64a915e637559b3987
2021-03-18 17:41:40 +00:00
Anthony Stange
0f97255402
Merge "Revert "Replace the usage of UidRange"" am: 83f77d83fd
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1645769
Change-Id: I2c1ea63ffad95538e8ae54d9cf601235191c6af0
2021-03-18 17:03:00 +00:00
Anthony Stange
83f77d83fd
Merge "Revert "Replace the usage of UidRange""
2021-03-18 16:40:53 +00:00
Anthony Stange
274c796731
Revert "Replace the usage of UidRange"
...
Revert "Replace the usage of UidRange"
Revert "Add shims for NetworkRequest"
Revert submission 1626206-replaceUidRange
Reason for revert: Breaking build - b/183106405
Reverted Changes:
I0b79c73e8:Add shims for NetworkRequest
I4bc0daf5a:Replace the usage of UidRange
I4e5aec6ef:Replace the usage of UidRange
I107c329d4:Expose uids related APIs in NetworkRequest and Net...
Change-Id: I5a4addc562d180487e2891fd2081c593126e6ffc
2021-03-18 16:30:59 +00:00
Chiachang Wang
54bf54b774
Merge "Replace the usage of UidRange" am: 1241156261 am: 73a03e9ca8
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1597481
Change-Id: I82fadd50f3141dab679d361cd17bf7a1f4349e9c
2021-03-18 14:28:24 +00:00
Chiachang Wang
73a03e9ca8
Merge "Replace the usage of UidRange" am: 1241156261
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1597481
Change-Id: Ia6ed617c849fd8ae68874b530f108428676068e6
2021-03-18 14:01:33 +00:00
Chiachang Wang
1241156261
Merge "Replace the usage of UidRange"
2021-03-18 13:36:39 +00:00
Chalard Jean
3f46774f42
Merge "Fix a bug where any() returns null" am: 3a1932cd79 am: dea6a318db
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1640139
Change-Id: I07d5c7f5e2a49cf7229176abc398f4f138351920
2021-03-18 11:14:37 +00:00
Chalard Jean
dea6a318db
Merge "Fix a bug where any() returns null" am: 3a1932cd79
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1640139
Change-Id: Icb56bbae07dc6de85668c0a202829c92422cbb3d
2021-03-18 10:36:29 +00:00
Chalard Jean
3a1932cd79
Merge "Fix a bug where any() returns null"
2021-03-18 09:59:21 +00:00
Maciej Żenczykowski
3f32a83207
fix whitespace in offload.c macro
...
Test: atest, TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com >
Change-Id: Ibe325714f95a1accce8add16220a31ca15913816
2021-03-18 02:34:01 -07:00
Maciej Żenczykowski
af1f314cbd
change PRIO_CLAT into a comment
...
Test: atest, TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com >
Change-Id: I44f3dc9e3a3462f275a04ed5601370f664b985a2
2021-03-18 02:33:56 -07:00
Remi NGUYEN VAN
13e433b63e
Merge "Remove networkAttributes resource usage" am: 584cfc6b67 am: 5916c38d92
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1639708
Change-Id: Ib09dccf181d2d9fa9cf31e8da3d4ee7454d2dc68
2021-03-17 12:34:22 +00:00
Remi NGUYEN VAN
5916c38d92
Merge "Remove networkAttributes resource usage" am: 584cfc6b67
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1639708
Change-Id: I94c174ca3ee356706947f213cb05d0a47deff233
2021-03-17 11:51:17 +00:00
Remi NGUYEN VAN
584cfc6b67
Merge "Remove networkAttributes resource usage"
2021-03-17 11:24:28 +00:00
Kimberly Kreider
17eae52145
Merge "Enable networking tests to be included in partial MTS files as well as full mts." am: 6f4d35119f am: 8266302ee7
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1531141
Change-Id: Id1fc29e6bfcc8422a2a2b8b0f609035b6ab9ae09
2021-03-17 03:07:27 +00:00
Kimberly Kreider
8266302ee7
Merge "Enable networking tests to be included in partial MTS files as well as full mts." am: 6f4d35119f
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1531141
Change-Id: I5aed0f6bfc7bbb30c5c6794431276e40a110b3a4
2021-03-17 02:47:32 +00:00
Kimberly Kreider
6f4d35119f
Merge "Enable networking tests to be included in partial MTS files as well as full mts."
2021-03-17 02:23:54 +00:00
Maciej Żenczykowski
870595ef67
Merge "Test conntrack event monitor on R" am: d5f07c1243 am: 4c9bfb1fbd
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1639707
Change-Id: Ifadec3b2360f535ace9504c0a3aa57950bbf1919
2021-03-16 13:27:10 +00:00
Maciej Żenczykowski
4c9bfb1fbd
Merge "Test conntrack event monitor on R" am: d5f07c1243
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1639707
Change-Id: I669b5b66d9a538365668788e2b4d45be41718ab9
2021-03-16 13:03:43 +00:00
Chalard Jean
1705798d13
Fix a bug where any() returns null
...
The type needs to be specified
Test: NetworkAgentTest
Change-Id: I7128ae520cb7175f1fb9467a94edfd1a4bdeb9da
2021-03-16 21:49:29 +09:00
Maciej Żenczykowski
d5f07c1243
Merge "Test conntrack event monitor on R"
2021-03-16 12:29:20 +00:00
Hungming Chen
62afc9809b
Test conntrack event monitor on R
...
Should not {start, stop} conntrack event monitor on R because
it is used by S feature.
Test: atest TetheringCoverageTests
Change-Id: I57a0a84d46e973660b24fc10d314820ada0d45b9
2021-03-16 18:14:38 +08:00
Treehugger Robot
cf31e5cbe4
Merge "Do not start conntrack event monitor when running on R" am: c162fc297f am: de2d7bef3b
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1639703
Change-Id: Iaebb922ecd5a62eb548f0ed6fede51c0ae8618a3
2021-03-16 09:05:49 +00:00
Treehugger Robot
de2d7bef3b
Merge "Do not start conntrack event monitor when running on R" am: c162fc297f
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1639703
Change-Id: Ib43879926b0b6789025ab2360c8dc0de1f28090f
2021-03-16 08:46:05 +00:00
Treehugger Robot
c162fc297f
Merge "Do not start conntrack event monitor when running on R"
2021-03-16 08:03:46 +00:00
Remi NGUYEN VAN
f1c04fb6b3
Remove networkAttributes resource usage
...
Supported network types are now deduced from system features, not the
networkAttributes resource.
Update the test to expect network types to be configured as per
resources before S, and to match system features on S+.
Bug: 146206136
Test: atest CtsNetTestCases:android.net.cts.ConnectivityManagerTest
Change-Id: I715924d562f439f7239c1c95d2dc5bca7095a123
2021-03-16 16:54:17 +09:00
Chalard Jean
830216e3f8
Merge "[NS01.cn] Adjust calls for NetworkScore" am: bc786632cf am: 1834461387
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1620870
Change-Id: Ib4318c685e4dd62ce68004041551e26437a8a631
2021-03-16 07:07:59 +00:00
Maciej Żenczykowski
277bed477f
Merge "add test for TetheringUtils::setupNsSocket()" am: d3bb5a544c am: b0c92ad6c8
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1638165
Change-Id: I8649019d166ccc13d37daacd1cd14dda398b6ca3
2021-03-16 07:07:46 +00:00
Lorenzo Colitti
d1107edddd
Merge "Add a test for TetheringUtils.setupNaSocket." am: d5edbb9eb4 am: 706d7ffb3e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1639699
Change-Id: Ib03fde8607b62802f897a5075ad0b638e9039fe6
2021-03-16 07:07:28 +00:00
Chalard Jean
1834461387
Merge "[NS01.cn] Adjust calls for NetworkScore" am: bc786632cf
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1620870
Change-Id: I1aa441d41d9256e843dee7745e865df8b0ccee53
2021-03-16 06:53:52 +00:00
Maciej Żenczykowski
b0c92ad6c8
Merge "add test for TetheringUtils::setupNsSocket()" am: d3bb5a544c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1638165
Change-Id: I2dcb5a315a3abc81a88c2625f28392fd6933af20
2021-03-16 06:47:53 +00:00
Lorenzo Colitti
706d7ffb3e
Merge "Add a test for TetheringUtils.setupNaSocket." am: d5edbb9eb4
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1639699
Change-Id: I2f7f6a5dcbc363bca3d113c0b2cb8e87aae450f2
2021-03-16 06:47:42 +00:00
Chalard Jean
bc786632cf
Merge "[NS01.cn] Adjust calls for NetworkScore"
2021-03-16 06:36:07 +00:00