LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,505 Commits 2 Branches 0 Tags
5cae85ecfa90cc4186578b59687f99b18ac3eb8f
Commit Graph

11505 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maciej Żenczykowski
5cae85ecfa Merge "bpf offload - add a new 'tether_xdp_devmap'" am: b908e0c867 am: f5a9d32a73 am: 993ede170f 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1612879

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I99a96289d7ed513dc2980e1cd572a01eb70d6cae
 2021-03-05 07:27:35 +00:00
Lorenzo Colitti
20c88e6e6f Merge changes I968bfa76,Id46f1e5b,Iff9b6212,I6bdb090a am: bc87f8a9d9 am: 69b2de6e5a am: 4d89e4899b 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1611318

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie37435f5e37b46436c3c4a026e855f00ea64a1c9
 2021-03-05 07:27:26 +00:00
Lorenzo Colitti
ae0e48cd66 Merge changes I968bfa76,Id46f1e5b,Iff9b6212,I6bdb090a am: bc87f8a9d9 am: 69b2de6e5a am: d1ea11ed6a 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1611318

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I337ec1a2b440f81a3e54a6a79e58b46d9d7e4def
 2021-03-05 07:26:47 +00:00
Maciej Żenczykowski
993ede170f Merge "bpf offload - add a new 'tether_xdp_devmap'" am: b908e0c867 am: f5a9d32a73 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1612879

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia43b04a9974288f6447e453cd645831b8efe6ca6
 2021-03-05 07:02:16 +00:00
Lorenzo Colitti
d1ea11ed6a Merge changes I968bfa76,Id46f1e5b,Iff9b6212,I6bdb090a am: bc87f8a9d9 am: 69b2de6e5a 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1611318

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0260aa93cbf2e8179de8bb7a13b65ca47fb0493d
 2021-03-05 07:02:12 +00:00
Lorenzo Colitti
4d89e4899b Merge changes I968bfa76,Id46f1e5b,Iff9b6212,I6bdb090a am: bc87f8a9d9 am: 69b2de6e5a 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1611318

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ief6f2a603bdc60b45f791a2d8f0b97befec44f7a
 2021-03-05 07:02:11 +00:00
Maciej Żenczykowski
f5a9d32a73 Merge "bpf offload - add a new 'tether_xdp_devmap'" am: b908e0c867 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1612879

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibde3d60cd0684ec28b6f8de9719bc31c91eae85c
 2021-03-05 06:22:15 +00:00
Lorenzo Colitti
69b2de6e5a Merge changes I968bfa76,Id46f1e5b,Iff9b6212,I6bdb090a am: bc87f8a9d9 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1611318

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I75098c183e04978665618e52b2ff56def5fbe464
 2021-03-05 06:22:07 +00:00
Maciej Żenczykowski
b908e0c867 Merge "bpf offload - add a new 'tether_xdp_devmap'" 2021-03-05 06:03:02 +00:00
Lorenzo Colitti
bc87f8a9d9 Merge changes I968bfa76,Id46f1e5b,Iff9b6212,I6bdb090a 
* changes:
  Use TestConnectivityManager in TetheringTest.
  Support building different UpstreamNetworkState test objects.
  Change TetheringTest's UpstreamNetworkMonitor from mock to spy.
  Make TestConnectivityManager usable by other tethering tests.
 2021-03-05 05:11:10 +00:00
Lorenzo Colitti
66287d3551 Use TestConnectivityManager in TetheringTest. 
The changes required are:
- Change all usages of when(mCm.method()).thenReturn(...) to
  doReturn(...).when(mCm).method() because spies must use the
  latter syntax.
- In setDataSaverEnabled, set the mocked return value before
  sending the broadcast. Otherwise, the first time the method is
  called, the spy will attempt to send the broadcast, and will
  crash because it does not have permission to do so.

This does not do anything useful yet, but it will be used in
future CLs.

Bug: 173068192
Test: atest TetheringTests
Change-Id: I968bfa76ead25b2d45ed1c0e8ede32df81401579
 2021-03-04 23:06:52 +09:00
Lorenzo Colitti
b424a2794e Support building different UpstreamNetworkState test objects. 
TetheringTest is only able to build UpstreamNetworkState objects
for mobile Internet networks. Support building wifi and dun
versions as well.

Bug: 173068192
Test: atest TetheringTests
Change-Id: Id46f1e5b65dbe04e84a5f56343821af260e2539e
 2021-03-04 23:02:40 +09:00
Lorenzo Colitti
bf69824479 Change TetheringTest's UpstreamNetworkMonitor from mock to spy. 
This allows future tests that want to exercise the interactions
between Tethering and UNM to do so.

Also verify what happens when UNM is initialized, and in setUp,
capture the NetworkCallback it files to track the default
network, so tests can send it NetworkCallbacks. (This callback
is only ever filed once.)

Test: test-only change
Change-Id: Iff9b62120cced41cc61263bfd4fa34f575d0ac00
 2021-03-04 23:02:40 +09:00
Lorenzo Colitti
d025c562f0 Make TestConnectivityManager usable by other tethering tests. 
Currently, this class is a static inner class of
UpstreamNetworkMonitorTest. Extract it to its own top-level class
so it can be used by other tests.

Bug: 173068192
Test: atest TetheringTests
Change-Id: I6bdb090a99781ac2530b3924ac5c4cf78de315b0
 2021-03-04 23:02:40 +09:00
TreeHugger Robot
fc4ffdb4c5 Merge "Mark the test app as debuggable." into sc-dev 2021-03-04 08:22:33 +00:00
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
Maciej Żenczykowski
db2cff5cdf bpf offload - add a new 'tether_xdp_devmap' 
It will map device ifindex to itself (but note that internally in the
kernel this is optimized into a map from ifindex to direct device
pointer), but only for xdp transmit capable devices (other devices
will not have an entry).

This will allow the use of bpf_redirect_map() from xdp tethering programs.

Test: atest, TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I29684e6761727d1115e9b4d75486eccbca3d5e33
 2021-03-01 23:42:43 -08:00
Remi NGUYEN VAN
fae3a439ee [automerged blank] Rename StringNetworkSpecifier to Ethernet 2p: de9dbf5b3c 
Blank merge reason: Change-Id I8a6d7cf41c4bbc61cee1bb5570cee5bbeb85be49 with SHA-1 e08f8cf7fc is in history

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

Change-Id: If2e68ddc0a8b3a280df55c1dadc95920637e9f01
 2021-03-02 05:12:42 +00:00
Remi NGUYEN VAN
de9dbf5b3c Rename StringNetworkSpecifier to Ethernet 
Tests just need a specifier to verify general NetworkSpecifier
functionality. They can use EthernetNetworkSpecifier the same way they
use StringNetworkSpecifier.

To keep the tests passing on Q and R, add a CompatUtil class that will
keep creating StringNetworkSpecifiers (now removed) instead.

Bug: 179329291
Test: atest CtsNetTestCases
(note the merged-in clause is an unrelated change, used to avoid the
branch)
Merged-In: I8a6d7cf41c4bbc61cee1bb5570cee5bbeb85be49

Change-Id: Ic6bf611ba36b555e4e0bb1bd3fa0053fe29dc8cf
 2021-03-02 05:12:30 +00:00
TreeHugger Robot
dacd68bdc5 [automerger skipped] Merge "DO NOT MERGE: re-enable ConnectivityManagerTest in mainline-prod." into mainline-prod am: 2d2be033e2 -s ours 
am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5d33590de4671d23c1168da09bbee5f954d82644
 2021-03-02 00:55:13 +00:00
TreeHugger Robot
2d2be033e2 Merge "DO NOT MERGE: re-enable ConnectivityManagerTest in mainline-prod." into mainline-prod 2021-03-02 00:22:34 +00:00
Treehugger Robot
72fdc45f46 Merge "Make ConnectivityManagerTest use the API shims." am: c8761c98ae am: c7d509804b am: 68b7e0e0a4 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1611323

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5ad4b4e82e81e08230af606068affeb96ae02d8c
 2021-03-01 21:12:01 +00:00
Treehugger Robot
750a7dd0d9 Merge "Make ConnectivityManagerTest use the API shims." am: c8761c98ae am: c7d509804b am: d5821f3c06 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1611323

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I871cb81b88ec2c02d838a6f0ea33f842a1aa15f6
 2021-03-01 20:48:44 +00:00
Treehugger Robot
d5821f3c06 Merge "Make ConnectivityManagerTest use the API shims." am: c8761c98ae am: c7d509804b 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1611323

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1b49229f76a378336c55d658e2e186973fe88a58
 2021-03-01 20:09:03 +00:00
Treehugger Robot
68b7e0e0a4 Merge "Make ConnectivityManagerTest use the API shims." am: c8761c98ae am: c7d509804b 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1611323

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib784ca6a840f4a89bb28f4930544ff9c6f37b82e
 2021-03-01 20:06:09 +00:00
Treehugger Robot
c7d509804b Merge "Make ConnectivityManagerTest use the API shims." am: c8761c98ae 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1611323

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie3de6a218eabeab2532d6ee4d27c7f2ee65b6065
 2021-03-01 19:30:24 +00:00
Sudheer Shanka
4041472853 Merge "Wait for the finish-component broadcasts to be handled." into sc-dev 2021-03-01 18:32:41 +00:00
Treehugger Robot
c8761c98ae Merge "Make ConnectivityManagerTest use the API shims." 2021-03-01 17:50:10 +00:00
Remi NGUYEN VAN
43fed99b1d Add CtsNetTestCases to TEST_MAPPING am: ad380c1de6 am: 94358c4c9e am: fa0aea21e2 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1612014

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieeb84e2d6855d18448e34fbdb6bea58412158647
 2021-03-01 10:56:56 +00:00
Remi NGUYEN VAN
a8052f90ce Add CtsNetTestCases to TEST_MAPPING am: ad380c1de6 am: 94358c4c9e am: 074f40bd54 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1612014

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib787ad220d4ebff2ce1d8ccacf029e1fa76d9d31
 2021-03-01 10:39:29 +00:00
Remi NGUYEN VAN
074f40bd54 Add CtsNetTestCases to TEST_MAPPING am: ad380c1de6 am: 94358c4c9e 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1612014

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I30f6e15c961f9cafa5e223d1d6f0ed3e6118d3cf
 2021-03-01 09:41:50 +00:00
Remi NGUYEN VAN
fa0aea21e2 Add CtsNetTestCases to TEST_MAPPING am: ad380c1de6 am: 94358c4c9e 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1612014

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4588f5e7e4444a34bc152b9ce71f1a8645548368
 2021-03-01 09:41:48 +00:00
Remi NGUYEN VAN
94358c4c9e Add CtsNetTestCases to TEST_MAPPING am: ad380c1de6 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1612014

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I35c8e85d9c321a96703e879ff2ce230749d7f9dd
 2021-03-01 09:02:25 +00:00
Remi NGUYEN VAN
7dd4182366 [automerger skipped] Merge "Add dependency on system API in connectivity" am: bc1bdf4a85 am: 68b759c2c1 am: 86301b1ae1 -s ours 
am skip reason: Change-Id Iebfb3e01c5d2480e84edcfc76cf489520bd60237 with SHA-1 cfe676379a is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I39bf52549f579c6dc040930a43b9d9b05e2d78a3
 2021-03-01 08:50:52 +00:00
TreeHugger Robot
897e686b52 [automerger skipped] Merge "Disable CtsNetTestCases in mainline-prod." into mainline-prod am: 87f6c8f756 -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/+/13725029

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1dfcf50d00b9afdae5a119d046e9452219fa8600
 2021-03-01 08:14:02 +00:00
Lorenzo Colitti
79d2ee0317 DO NOT MERGE: re-enable ConnectivityManagerTest in mainline-prod. 
Bug: 167645754
Ignore-AOSP-First: test is already enabled in AOSP
Test: atest CtsNetTestCasesLatestSdk passes on R device
Change-Id: I9677518a6a43bf3195e42ba21291a84846e31f14
 2021-03-01 16:44:58 +09:00
Lorenzo Colitti
8060dfed23 Make ConnectivityManagerTest use the API shims. 
This is required for the code to be identical in AOSP and
mainline-prod.

Bug: 167645754
Test: atest CtsNetTestCases passes on AOSP device
Test: atest CtsNetTestCasesLatestSdk passes on AOSP device
Test: atest CtsNetTestCasesLatestSdk passes on R device
Change-Id: I094906e535d710a46a3fa833b6aa48cb007d6b63
 2021-03-01 15:59:40 +09:00
Remi NGUYEN VAN
ad380c1de6 Add CtsNetTestCases to TEST_MAPPING 
CtsNetTestCases is identical to CtsNetTestCasesLatestSdk,
with a newer target_sdk and newer API shims.

Bug: 167645754
Change-Id: Ib4e281bf84cb6ba0e7b904d57cef7c985dec2132
Test: atest CtsNetTestCases
 2021-03-01 06:54:57 +00:00
TreeHugger Robot
87f6c8f756 Merge "Disable CtsNetTestCases in mainline-prod." into mainline-prod 2021-03-01 06:29:46 +00:00
Lorenzo Colitti
b34ed63a36 Disable CtsNetTestCases in mainline-prod. 
This currently still builds, but it will stop building as soon
as we make it depend on the networkstack current shims. It should
not be used for anything in mainline-prod anyway, everything uses
CtsNetTestCasesLatestSdk.

The Merged-In clause is from unrelated change aosp/1542627 and is
intended to ensure this change does not propagate to any
downstream branches.

Bug: 167645754
Test: mmm packages/modules/Connectivity
Change-Id: Ib47b181902e8e634f419e5544472859760c2ce77
Merged-In: Ib0ac49609e444a53a6fee4575f5078e15f364eef
 2021-03-01 14:02:41 +09:00
Sudheer Shanka
9326a98dd9 Wait for the finish-component broadcasts to be handled. 
Bug: 180533352
Test: atest ./tests/cts/hostside/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
Ignore-AOSP-First: Expedited jobs are not available in AOSP
Change-Id: I564c15c2fd6caba61029f2b282e7a3c3afeca120
 2021-02-28 19:01:31 -08:00
Lorenzo Colitti
e4391fb4b4 [automerger skipped] Use NET_CAPABILITY_NOT_VCN_MANAGED from ConstantsShim. am: 589d0ad195 am: 894c6ff74a am: c715bf96b9 -s ours 
am skip reason: Change-Id If40ebfadbf6d3ee86a58a55711fbc146a8599fdb with SHA-1 7246474dfd is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2f15c603768471826d332df6bbdbea6c11f6c9cf
 2021-03-01 02:47:28 +00:00
Remi NGUYEN VAN
f461e9fa41 [automerger skipped] Merge "Add dependency on system API in connectivity" am: bc1bdf4a85 am: 68b759c2c1 -s ours am: 378cdb79ae -s ours 
am skip reason: Change-Id Iebfb3e01c5d2480e84edcfc76cf489520bd60237 with SHA-1 cfe676379a is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia53551812efd456255f58cb4d541a839e6b2e1f7
 2021-03-01 02:46:32 +00:00
Lorenzo Colitti
882db950a6 [automerger skipped] Use NET_CAPABILITY_NOT_VCN_MANAGED from ConstantsShim. am: 589d0ad195 am: 894c6ff74a -s ours am: f5716d15a1 -s ours 
am skip reason: Change-Id If40ebfadbf6d3ee86a58a55711fbc146a8599fdb with SHA-1 7246474dfd is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3fd493a8a6d65c637616550b3c9465916cf3be47
 2021-03-01 02:46:25 +00:00
Remi NGUYEN VAN
86301b1ae1 Merge "Add dependency on system API in connectivity" am: bc1bdf4a85 am: 68b759c2c1 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1552320

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I98afe8d83f2a111b0a0bc3bc1081fb35ea31a328
 2021-03-01 02:25:13 +00:00
Remi NGUYEN VAN
378cdb79ae [automerger skipped] Merge "Add dependency on system API in connectivity" am: bc1bdf4a85 am: 68b759c2c1 -s ours 
am skip reason: Change-Id Ic2491f04880ff66abc3b2d3aaee6168e18f6d68a with SHA-1 50caf56267 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8a4f14be93111a9907319fc38c053ca4b4b4384b
 2021-03-01 02:24:41 +00:00
Remi NGUYEN VAN
68b759c2c1 Merge "Add dependency on system API in connectivity" am: bc1bdf4a85 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1552320

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib1db46318bbccfc496f5fcc9481e177d66e9b46a
 2021-03-01 02:10:04 +00:00
Lorenzo Colitti
c715bf96b9 Use NET_CAPABILITY_NOT_VCN_MANAGED from ConstantsShim. am: 589d0ad195 am: 894c6ff74a 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1611315

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I524c692df857f07d17d038271597137fcb38d705
 2021-03-01 02:04:29 +00:00
Lorenzo Colitti
f5716d15a1 [automerger skipped] Use NET_CAPABILITY_NOT_VCN_MANAGED from ConstantsShim. am: 589d0ad195 am: 894c6ff74a -s ours 
am skip reason: Change-Id If40ebfadbf6d3ee86a58a55711fbc146a8599fdb with SHA-1 7246474dfd is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I750f9eb205bce8bacae0b2406fcd0ce424e75516
 2021-03-01 02:04:26 +00:00
Remi NGUYEN VAN
bc1bdf4a85 Merge "Add dependency on system API in connectivity" 2021-03-01 01:07:19 +00:00