Commit Graph

11453 Commits

Author SHA1 Message Date
Sudheer Shanka
a723fbd612 Mark the test app as debuggable.
Accessing @TestApis is only allowed for
debuggable APKs on release builds.

Fixes: 181594072
Test: atest ./tests/cts/hostside/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
Ignore-AOSP-First: Related CL http://ag/13615939 is not in AOSP yet.
Change-Id: I7777d70e3dc4217e7eb931060feb658d8943962a
2021-03-04 05:25:30 +00:00
Junyu Lai
e08f8cf7fc Merge "Fix CTS test failed on R device" am: 75d28bee27 am: 3ec8882370 am: 239c23c9dc
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1602480

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8a6d7cf41c4bbc61cee1bb5570cee5bbeb85be49
2021-02-26 17:31:47 +00:00
Remi NGUYEN VAN
209a87d591 Merge "Add flag to force choosing upstreams automatically" am: e43c960d50 am: a474b9edfa am: af4b10e326
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1596352

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I071f90039668ea2e6d665b0ab432bab228c36696
2021-02-26 17:31:15 +00:00
Treehugger Robot
9d80e9cda5 Merge "ebpf offload: bump size of ipv4 tethering maps" am: fcd5ec1971 am: f1a420808c am: c6551d73b7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1608893

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I19750e73d9a67db892a06a47a0bfeb8c6c4d20c8
2021-02-26 17:30:38 +00:00
Treehugger Robot
fd8d2a38ea Merge "ebpf offload: mark as critical for tethering not netd" am: 4945772ba7 am: 9ea87036a8 am: ff55bbf0f4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1607252

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8247e3231c81138becbd8acc80ff9647b0443c32
2021-02-26 17:29:12 +00:00
Junyu Lai
5881216ccd Merge "[VCN07.1] Add test for bypassing VCN for non-internet request" am: 3f134a3805 am: b209d3a2a7 am: 5e92915fa0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1597477

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ice9cf7bfdfe80abf62c8516136895b9d5dd258b1
2021-02-26 17:25:16 +00:00
Lorenzo Colitti
0950f0e83a [automerger skipped] Use NET_CAPABILITY_NOT_VCN_MANAGED from ConstantsShim. am: 7246474dfd -s ours
am skip reason: Change-Id I5cd32efd0f87c823cd2d0a2fa3a95a83093fb6f9 with SHA-1 ffb0ccd04b is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/13709245

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If1592305569a5112ec2719fbc376d1ea9b69a85f
2021-02-26 15:54:10 +00:00
Lorenzo Colitti
7246474dfd Use NET_CAPABILITY_NOT_VCN_MANAGED from ConstantsShim.
This is required to build in mainline-prod, which does not have
access to in-progress S APIs.

The Merged-In tag in this CL is from aosp/1604974, which is an
arbitrary CL that is already in sc-dev, with the purpose of
preventing this CL from reaching sc-dev.

Bug: 167645754
Ignore-AOSP-First: need to fix build
Test: m NetworkStack CtsNetTestCasesLatestSdk CtsHostsideNetworkTests CtsHostsideNetworkTestsApp
Change-Id: If40ebfadbf6d3ee86a58a55711fbc146a8599fdb
Merged-In: I5cd32efd0f87c823cd2d0a2fa3a95a83093fb6f9
2021-02-26 13:48:00 +00:00
Junyu Lai
7b0fc6f309 Merge "Fix CTS test failed on R device" am: 75d28bee27 am: 3ec8882370 am: 0937250278
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1602480

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie091b95fd2dc27f2cd03aa45e316fc5f8af0188b
2021-02-26 11:13:44 +00:00
Remi NGUYEN VAN
cede7f6032 Merge "Add flag to force choosing upstreams automatically" am: e43c960d50 am: a474b9edfa am: 62a1ba2d1b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1596352

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id88654e5344f3be87885d4214189d5c90f66ae6d
2021-02-26 11:13:39 +00:00
Treehugger Robot
7eab6c5c9f Merge "ebpf offload: bump size of ipv4 tethering maps" am: fcd5ec1971 am: f1a420808c am: f14f0783aa
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1608893

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icabf533dee7e6f9d57e23f4e4e58d40e8a714aa5
2021-02-26 11:13:33 +00:00
Treehugger Robot
bf45229ed9 Merge "ebpf offload: mark as critical for tethering not netd" am: 4945772ba7 am: 9ea87036a8 am: 0057b06d90
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1607252

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7cf9212f5d8e0c35303406876ff7e772725dd7c0
2021-02-26 11:13:17 +00:00
Junyu Lai
31d4b0a112 Merge "[VCN07.1] Add test for bypassing VCN for non-internet request" am: 3f134a3805 am: b209d3a2a7 am: da1951ace8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1597477

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icfb07b84b3a6d708241eec5629c8fccc79b712b1
2021-02-26 11:12:21 +00:00
Junyu Lai
239c23c9dc Merge "Fix CTS test failed on R device" am: 75d28bee27 am: 3ec8882370
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1602480

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I856c51aa30da6d9e5097aee2a65fb99f8c6fb8aa
2021-02-26 10:07:11 +00:00
Chalard Jean
dd01e4d688 Merge "Release test network in a test" am: 26c11595bc am: d3e8ae1f88 am: 41870192e3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1605235

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I92f3749b7e6de72fa256d1389627602523bf1a0c
2021-02-26 10:04:24 +00:00
Remi NGUYEN VAN
af4b10e326 Merge "Add flag to force choosing upstreams automatically" am: e43c960d50 am: a474b9edfa
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1596352

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib53feb1dce0a6f2c84d493fc5cbfa248320ecea1
2021-02-26 10:02:30 +00:00
Junyu Lai
0937250278 Merge "Fix CTS test failed on R device" am: 75d28bee27 am: 3ec8882370
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1602480

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9003eaba1c2548349904c5281cfaf0089320c56a
2021-02-26 10:01:40 +00:00
Remi NGUYEN VAN
62a1ba2d1b Merge "Add flag to force choosing upstreams automatically" am: e43c960d50 am: a474b9edfa
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1596352

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaef23446e43ef557521785a23e5dcf81655d7f05
2021-02-26 10:01:35 +00:00
Daulet Zhanguzin
ae985e1414 Use unbundled version of BouncyCastle in Ike cts tests am: bb540131b7 am: c4f27ccd99 am: f50b47f13f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1605037

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib0416b7faa0ed34153f0b47caaa8e256fea5a887
2021-02-26 09:48:01 +00:00
Junyu Lai
3ec8882370 Merge "Fix CTS test failed on R device" am: 75d28bee27
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1602480

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I76b422a0f86a5ca63021d1cb88db37089a310280
2021-02-26 09:31:05 +00:00
Remi NGUYEN VAN
a474b9edfa Merge "Add flag to force choosing upstreams automatically" am: e43c960d50
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1596352

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If6b4415a3a3f507101d63b53296925b3572ebf1e
2021-02-26 09:30:57 +00:00
Remi NGUYEN VAN
77bb91ce04 Merge "Add dependency on system API in connectivity" into sc-dev 2021-02-26 09:20:23 +00:00
Treehugger Robot
c6551d73b7 Merge "ebpf offload: bump size of ipv4 tethering maps" am: fcd5ec1971 am: f1a420808c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1608893

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I325505e6f5431134e6b5dc336a5e120479157d29
2021-02-26 09:15:06 +00:00
Treehugger Robot
ff55bbf0f4 Merge "ebpf offload: mark as critical for tethering not netd" am: 4945772ba7 am: 9ea87036a8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1607252

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie672e82b07825833a1417f0ca67dd0e8e413eabf
2021-02-26 09:14:53 +00:00
Junyu Lai
75d28bee27 Merge "Fix CTS test failed on R device" 2021-02-26 07:17:47 +00:00
Treehugger Robot
f14f0783aa Merge "ebpf offload: bump size of ipv4 tethering maps" am: fcd5ec1971 am: f1a420808c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1608893

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I315667fba6cafe2e43e217a3fd430cbd219f849e
2021-02-26 06:57:11 +00:00
Treehugger Robot
0057b06d90 Merge "ebpf offload: mark as critical for tethering not netd" am: 4945772ba7 am: 9ea87036a8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1607252

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifa82c02dee9bad56257d3834c16091f19f7cdd41
2021-02-26 06:57:05 +00:00
Junyu Lai
da1951ace8 Merge "[VCN07.1] Add test for bypassing VCN for non-internet request" am: 3f134a3805 am: b209d3a2a7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1597477

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic26361a1b95dcdf6322b086e558a843a645a0a8e
2021-02-26 06:56:59 +00:00
Chalard Jean
41870192e3 Merge "Release test network in a test" am: 26c11595bc am: d3e8ae1f88
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1605235

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I698d0908daa511b48b387d973fdd8b724a203e75
2021-02-26 06:56:52 +00:00
Daulet Zhanguzin
f50b47f13f Use unbundled version of BouncyCastle in Ike cts tests am: bb540131b7 am: c4f27ccd99
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1605037

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icaef49183428ae3f2d7404dfa39a49258d406926
2021-02-26 06:56:24 +00:00
Remi NGUYEN VAN
e43c960d50 Merge "Add flag to force choosing upstreams automatically" 2021-02-26 06:42:00 +00:00
Treehugger Robot
f1a420808c Merge "ebpf offload: bump size of ipv4 tethering maps" am: fcd5ec1971
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1608893

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iccd3542628882fdaa25ed0a5b2c073f596ea198b
2021-02-26 06:05:10 +00:00
Treehugger Robot
9ea87036a8 Merge "ebpf offload: mark as critical for tethering not netd" am: 4945772ba7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1607252

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8d58bccf80be1fa6346922abd769c1b96e4274be
2021-02-26 06:04:04 +00:00
Treehugger Robot
fcd5ec1971 Merge "ebpf offload: bump size of ipv4 tethering maps" 2021-02-26 05:43:07 +00:00
Treehugger Robot
4945772ba7 Merge "ebpf offload: mark as critical for tethering not netd" 2021-02-26 05:39:07 +00:00
Lorenzo Colitti
c7037cd3b6 [automerger skipped] Revert "Update tests to use Doze DeviceConfig flags." am: 264d8e24bd -s ours
am skip reason: Change-Id Ib0ac49609e444a53a6fee4575f5078e15f364eef with SHA-1 2812f607a0 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/13698294

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iac884b22e7996b97a1dfcd3b815e10702bc15bb0
2021-02-26 04:36:51 +00:00
Lorenzo Colitti
73b11dbbe2 [automerger skipped] Revert "Fix DeviceConfig resetting." am: 9afd779325 -s ours
am skip reason: Change-Id Ib0ac49609e444a53a6fee4575f5078e15f364eef with SHA-1 2812f607a0 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/13698292

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5673c06d611ef029c8a3d5a46edfe812a1c889aa
2021-02-26 04:36:49 +00:00
Lorenzo Colitti
cb7dc39a41 [automerger skipped] Revert "Do not install tethering in TEST_MAPPING" am: 5de0092e3c -s ours
am skip reason: Change-Id Ib0ac49609e444a53a6fee4575f5078e15f364eef with SHA-1 2812f607a0 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/13692973

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I98420ddd38837c4f5b5dbf5c530d8a86ebea4903
2021-02-26 04:36:47 +00:00
Daulet Zhanguzin
9743024f79 [automerger skipped] Use unbundled version of BouncyCastle in Ike cts tests am: ac80a885b0 -s ours
am skip reason: Change-Id I78c053150bb9cf86173f869dd6e13e9a6917ffa7 with SHA-1 bb540131b7 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/13697005

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie99dbf533ca4244d41fcbcd5bed83e7ace472834
2021-02-26 04:36:45 +00:00
Lorenzo Colitti
5459c17010 [automerger skipped] Temporarily stop compiling three CTS tests. am: d3d4461f48 -s ours
am skip reason: Change-Id Ib0ac49609e444a53a6fee4575f5078e15f364eef with SHA-1 2812f607a0 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/13693497

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5b4c8bde82f78e7163c8a519ba67000b92fd56db
2021-02-26 04:36:43 +00:00
Lorenzo Colitti
44b70a7e36 [automerger skipped] Use the R checkAndNoteWriteSettingsOperation method. am: 33b3e53faa -s ours
am skip reason: Change-Id Ib0ac49609e444a53a6fee4575f5078e15f364eef with SHA-1 2812f607a0 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/13693496

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic296b357a9a381eac227be872c90d4e2a15dcf1c
2021-02-26 04:36:40 +00:00
Lorenzo Colitti
c236648ebd [automerger skipped] Revert "Revert^2 "Add service-connectivity to tethering APEX"" am: 50caf56267 -s ours
am skip reason: Change-Id Ib0ac49609e444a53a6fee4575f5078e15f364eef with SHA-1 2812f607a0 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/13693495

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5d64493796540fc20a6a00f5de2f25ec91becaf4
2021-02-26 04:36:38 +00:00
Lorenzo Colitti
56e6d83d98 [automerger skipped] Merge remote-tracking branch 'goog/rvc-qpr-dev-plus-aosp' into merge-sc-dev-plus-aosp-then-rvc-qpr-dev-plus-aosp am: 09074df188 -s ours
am skip reason: Change-Id Ib0ac49609e444a53a6fee4575f5078e15f364eef with SHA-1 2812f607a0 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/13693494

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6d61532cfdedd31f2dd65902d2185bc5d3ddb75e
2021-02-26 04:36:36 +00:00
Lorenzo Colitti
cd6aaf7e60 [automerger skipped] Merge remote-tracking branch 'goog/sc-dev-plus-aosp' into merge-sc-dev-plus-aosp-then-rvc-qpr-dev-plus-aosp am: 1498ad9ac1 -s ours
am skip reason: Change-Id Ib0ac49609e444a53a6fee4575f5078e15f364eef with SHA-1 2812f607a0 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/13693493

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibe246bfddd5586d4dba3e798b099ebbd66e9f2a4
2021-02-26 04:36:34 +00:00
TreeHugger Robot
43e386bb95 [automerger skipped] Merge "Use ACCESS_WIFI_STATE when clearing wifi blacklist" into mainline-prod am: 54356b303d -s ours
am skip reason: Change-Id I63e76918421e5deb59fe67a64674348fb8d20265 with SHA-1 72c7fe9b0c is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/13149619

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I69bb902c084cda75f5073d52594f8bf19c699177
2021-02-26 04:36:06 +00:00
Maciej Żenczykowski
8549af9f17 ebpf offload: bump size of ipv4 tethering maps
For ipv6 we need 1 entry per client, so 64 seems like plenty,
while for ipv4 we need 1 entry per flow, so even 1024 seems
like it might not be enough, but it's much better than 64.

Nucca says:
  # cat proc/sys/net/netfilter/nf_conntrack_buckets
  65536
  # cat proc/sys/net/netfilter/nf_conntrack_max
  262144

  per https://www.kernel.org/doc/Documentation/networking/nf_conntrack-sysctl.txt
  the default “nf_conntrack_max” is “nf_conntrack_buckets * 4”.

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ib7d1d8c19bc688c442d842cf5c9f45cdf1241754
2021-02-25 19:11:39 -08:00
Maciej Żenczykowski
607d6dda0d ebpf offload: mark as critical for tethering not netd
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I5bccfcbababb09a412ac1093513ad93c254b349b
2021-02-25 19:10:01 -08:00
Lorenzo Colitti
264d8e24bd Revert "Update tests to use Doze DeviceConfig flags."
This change went into internal after R branched, and did not
go to AOSP. Revert it in mainline-prod in order to ensure that
CtsHostsideNetworkTests builds.

These tests are developed in internal, not AOSP, so do not need
to automerge to mainline-prod.

Bug: 167645754
Test: treehugger
Ignore-AOSP-First: needed to sync mainline-prod with AOSP
Merged-In: Ib0ac49609e444a53a6fee4575f5078e15f364eef
Change-Id: I2b7d9855b81be5ef968a3de72bf9f7e7225075e1
2021-02-26 00:43:57 +09:00
Lorenzo Colitti
9afd779325 Revert "Fix DeviceConfig resetting."
This change went into internal after R branched, and did not
go to AOSP. Revert it in mainline-prod in order to ensure that
CtsHostsideNetworkTests builds.

These tests are developed in internal, not AOSP, so do not need
to automerge to mainline-prod.

Bug: 167645754
Test: treehugger
Ignore-AOSP-First: needed to sync mainline-prod with AOSP
Change-Id: Ieb1f0ce2a69180bbe89f810ddb3b48188ae3530e
Merged-In: Ib0ac49609e444a53a6fee4575f5078e15f364eef
2021-02-26 00:43:18 +09:00
Junyu Lai
5e92915fa0 Merge "[VCN07.1] Add test for bypassing VCN for non-internet request" am: 3f134a3805 am: b209d3a2a7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1597477

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie52bba30ff711c91ef36cb2add9167fbfc80e005
2021-02-25 12:48:07 +00:00