Commit Graph

11425 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
Lorenzo Colitti
5de0092e3c Revert "Do not install tethering in TEST_MAPPING"
This reverts commit c2858740c1.

Reason for revert: tethering in mainline-prod should always be
updatable.

Bug: 167645754
Test: treehugger
Ignore-AOSP-First: this change must not go into AOSP
Change-Id: I0e60eb2c4a1a2e8e985c8ff91d343d1255ddf783
Merged-In: Ib0ac49609e444a53a6fee4575f5078e15f364eef
2021-02-25 20:42:59 +09:00
Daulet Zhanguzin
ac80a885b0 Use unbundled version of BouncyCastle in Ike cts tests
Since BouncyCastle APIs provided by platform vary, use unbundled
BouncyCastle

Fixes: 180870458
Test: atest CtsNetTestCases
Change-Id: I78c053150bb9cf86173f869dd6e13e9a6917ffa7
Merged-In: I78c053150bb9cf86173f869dd6e13e9a6917ffa7
2021-02-25 20:42:59 +09:00
Lorenzo Colitti
d3d4461f48 Temporarily stop compiling three CTS tests.
This is better than commenting out code because any changes in
AOSP will automerge cleanly. When these tests are fixed by
adding a shim for ConnectivityManager, we can simply revert this
change.

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idfe60822e28968c52514497e43537cb6e9c0fae3
2021-02-25 11:03:33 +00:00
Chalard Jean
fb2192f670 Merge "Release test network in a test" am: 26c11595bc am: d3e8ae1f88 am: a1596090db
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1605235

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I96044cf7ee80a2d71114bc357b93001ec2c89df3
2021-02-25 10:22:03 +00:00
Junyu Lai
3f134a3805 Merge "[VCN07.1] Add test for bypassing VCN for non-internet request" 2021-02-25 10:16:03 +00:00
Chalard Jean
a1596090db 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: If5156e2a908c969c80eb09123fe88bef0ecc4285
2021-02-25 09:36:31 +00:00
Sudheer Shanka
54c8041ff0 Merge "Update CtsHostsideNetworkTests to take network capability into account." into sc-dev 2021-02-25 09:19:14 +00:00
Daulet Zhanguzin
39ae785e3f Use unbundled version of BouncyCastle in Ike cts tests am: bb540131b7 am: c4f27ccd99 am: f82155f4b9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1605037

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iee67d255b39a153cfa3e02a652291bfe627708f0
2021-02-25 08:49:26 +00:00
Chalard Jean
d3e8ae1f88 Merge "Release test network in a test" am: 26c11595bc
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1605235

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iae36d7f39bd1ff5287311df965829f6dee3de0d4
2021-02-25 08:46:15 +00:00
Chalard Jean
26c11595bc Merge "Release test network in a test" 2021-02-25 08:06:15 +00:00
Daulet Zhanguzin
f82155f4b9 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: I7dba95a6c7cdf6ea57b21136b40e8debcf9490db
2021-02-25 08:01:32 +00:00
Lorenzo Colitti
33b3e53faa Use the R checkAndNoteWriteSettingsOperation method.
In S, there is a new overload that takes an attribution tag as
well. Don't use this method yet, and add a TODO to call it via
a shim.

Bug: 167645754
Test: m com.android.tethering
Ignore-AOSP-First: needed to sync mainline-prod with AOSP
Change-Id: Ib49a73aa28d3abfc1b8f1cdad84abb022c49efe8
Merged-In: Ib0ac49609e444a53a6fee4575f5078e15f364eef
2021-02-25 16:53:26 +09:00
Lorenzo Colitti
50caf56267 Revert "Revert^2 "Add service-connectivity to tethering APEX""
As part of syncing the tethering code from AOSP to mainline-prod,
revert the changes to the build file that added the connectivity
jar and made the module no longer updatable.

The intent is to build and release the tethering module in
mainline-prod, from latest AOSP code, without including the
connectivity code, which depends on S APIs.

This reverts commit 2812f607a0.

Bug: 167645754
Test: m com.android.tethering
Ignore-AOSP-First: needed to sync mainline-prod with AOSP
Change-Id: Ic2491f04880ff66abc3b2d3aaee6168e18f6d68a
Merged-In: Ib0ac49609e444a53a6fee4575f5078e15f364eef
2021-02-25 16:53:24 +09:00
Daulet Zhanguzin
c4f27ccd99 Use unbundled version of BouncyCastle in Ike cts tests am: bb540131b7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1605037

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I46509df9b0f5c69d698f14c5a253b75fd4f71729
2021-02-25 07:24:03 +00:00
Lorenzo Colitti
09074df188 Merge remote-tracking branch 'goog/rvc-qpr-dev-plus-aosp' into merge-sc-dev-plus-aosp-then-rvc-qpr-dev-plus-aosp
This CL merges rvc-qpr-dev-plus-aosp on top of sc-dev-plus-aosp
on top of mainline-prod. It picks up changes that were merged
into aosp/master before sc-dev-plus-aosp was on the path between
AOSP and master. One such very simple CL is aosp/1554765.

There were no merge conflicts.

Current diffstat with aosp/master is:
 97 files changed, 2219 insertions(+), 84 deletions(-)

This includes 1800 lines of translations added in 72 files like
Tethering/res/values-*/strings.xml

Bug: 167645754
Test: no merge conflicts
Test: didn't even try to build
Ignore-AOSP-First: this is a merge from AOSP
Change-Id: I63af0b95e2d0e6bddc217c29014c03ea0dbda6ec
Merged-In: Ib0ac49609e444a53a6fee4575f5078e15f364eef
2021-02-25 16:23:06 +09:00
Lorenzo Colitti
1498ad9ac1 Merge remote-tracking branch 'goog/sc-dev-plus-aosp' into merge-sc-dev-plus-aosp-then-rvc-qpr-dev-plus-aosp
This CL merges sc-dev-plus-aosp into mainline-prod. It picks up
changes that:
- Were merged into sc-dev and automerged into sc-dev-plus-aosp
- Were merged into aosp master while sc-dev-plus-aosp was on the
  path between AOSP and master.

It does not pick up changes that were merged into aosp before
sc-dev-plus-aosp was on the merge path from AOSP to master. One
such very simple CL is aosp/1554765.

There were no merge conflicts.

Current diffstat with aosp/master is:

 161 files changed, 2923 insertions(+), 4005 deletions(-)

This includes 1800 lines of translations added in 72 files like
Tethering/res/values-*/strings.xml

Bug: 167645754
Test: no merge conflicts
Test: didn't even try to build
Ignore-AOSP-First: this is a merge from AOSP
Change-Id: Ie82ff0d3fcb82f0d66534b114af9f240f5574bfb
Merged-In: Ib0ac49609e444a53a6fee4575f5078e15f364eef
2021-02-25 16:22:15 +09:00
Sudheer Shanka
4a96c79495 Update CtsHostsideNetworkTests to take network capability into account.
Bug: 177641226
Test: atest ./tests/cts/hostside/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
Ignore-AOSP-First: Expedited jobs are not available in AOSP
Change-Id: Ic75ebdc184764b7e7ac02d3e2ca18cbba1c55ee5
2021-02-24 08:00:12 -08:00
Chalard Jean
8a8bf7434c Release test network in a test
This causes failures in subsequent tests that expect
only one test network to be up.

Bug: 181033598
Test: this
Change-Id: I74444f4aff7750a5bbd2564e5e22714d73c72d8b
2021-02-24 23:07:13 +09:00
Lorenzo Colitti
bd23387276 Add a BpfMap#clear method. am: ffb0ccd04b am: 10be22076e am: ad38d27ebb
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1604974

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I77144b7db5300bcddbfd97b72c5c958d126ca628
2021-02-24 13:18:44 +00:00
Daulet Zhanguzin
bb540131b7 Use unbundled version of BouncyCastle in Ike cts tests
Since BouncyCastle APIs provided by platform vary, use unbundled
BouncyCastle

Fixes: 180870458
Test: atest CtsNetTestCases
Change-Id: I78c053150bb9cf86173f869dd6e13e9a6917ffa7
2021-02-24 13:09:36 +00:00
Lorenzo Colitti
ad38d27ebb Add a BpfMap#clear method. am: ffb0ccd04b am: 10be22076e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1604974

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1e4d5e6005cdd006ddd814692714fb80a6c46936
2021-02-24 12:30:56 +00:00
Lorenzo Colitti
10be22076e Add a BpfMap#clear method. am: ffb0ccd04b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1604974

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idebe06d79cb8f6e91634057c59bb0cc022ba1ee0
2021-02-24 11:40:11 +00:00
Lorenzo Colitti
a26f72c34d Make the CTS tests explicitly depend on modules-utils-build. am: 2be434ab12 am: 6af777632d am: f6603588ab
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1604973

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib914dff2e0fe6b94902d53130eefe8bfce7b3a62
2021-02-24 07:39:10 +00:00
Lorenzo Colitti
1326473f6a Move definitions used by tethering bpf code into the module. am: 56be03eb28 am: 69b0769eb0 am: 4d09a87075
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1601855

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic9fddebf7ed3d384d2c2c89e85d3bbed58d9ea2d
2021-02-24 07:38:29 +00:00
Lorenzo Colitti
f6603588ab Make the CTS tests explicitly depend on modules-utils-build. am: 2be434ab12 am: 6af777632d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1604973

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idfdd67fa1502614e57d7a2b3ea6fdae788024b4c
2021-02-24 07:00:05 +00:00