LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,653 Commits 2 Branches 0 Tags
554745cae7bd831786a7190cc621eb13f52b99e4
Commit Graph

1558 Commits

Author SHA1 Message Date
Kimberly Kreider
38e41e4404 Merge "Enable networking tests to be included in partial MTS files as well as full mts." am: 6f4d35119f am: 8266302ee7 am: 17eae52145 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1531141

Change-Id: Ic16ee449e5eec1e947ac215d5aa27845c0e2e675
 2021-03-17 03:48:42 +00:00
Aaron Huang
517cfad3e6 Merge "Update import class of TAG_SYSTEM_NEIGHBOR" into sc-dev 2021-03-17 03:16:56 +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
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
8726a8bc8e Merge "Test conntrack event monitor on R" am: d5f07c1243 am: 4c9bfb1fbd am: 870595ef67 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1639707

Change-Id: I8f24ab0b2fdabb71991c2cf77833e6dbf4f8046c
 2021-03-16 14:31:47 +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
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
c394bc2089 Merge "Do not start conntrack event monitor when running on R" am: c162fc297f am: de2d7bef3b am: cf31e5cbe4 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1639703

Change-Id: Ic5b03b49e605057a048100fcc1e5b22b158e47c3
 2021-03-16 09:49:12 +00: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
c162fc297f Merge "Do not start conntrack event monitor when running on R" 2021-03-16 08:03:46 +00:00
Maciej Żenczykowski
5fee5079dc Merge "add test for TetheringUtils::setupNsSocket()" am: d3bb5a544c am: b0c92ad6c8 am: 277bed477f 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1638165

Change-Id: I497be045f1884e8a5ca166a812a4cc04768dde3e
 2021-03-16 07:11:35 +00:00
Lorenzo Colitti
c4cff79329 Merge "Add a test for TetheringUtils.setupNaSocket." am: d5edbb9eb4 am: 706d7ffb3e am: d1107edddd 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1639699

Change-Id: Id940af07f2191e0460dee40bdffa5a0ffc3745ba
 2021-03-16 07:11:29 +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
Maciej Żenczykowski
d3bb5a544c Merge "add test for TetheringUtils::setupNsSocket()" 2021-03-16 06:23:06 +00:00
Hungming Chen
23ee901e76 Do not start conntrack event monitor when running on R 
Starting conntrack event monitor on R devices is unnecessary because
no code uses them.

Bug: 177884581
Test: atest TetheringCoverageTests
Change-Id: I036cb8e29b32a4e220da9a52849b978a6ab821e4
 2021-03-16 14:18:32 +08:00
Lorenzo Colitti
d5edbb9eb4 Merge "Add a test for TetheringUtils.setupNaSocket." 2021-03-16 06:17:37 +00:00
Maciej Żenczykowski
e7c57368f8 add test for TetheringUtils::setupNsSocket() 
Bug: 154669942
Test: test-only change
Change-Id: I33fe5a92667a0a6ee38bbcfdee40405cd37cc30f
 2021-03-15 21:10:21 -07:00
Lorenzo Colitti
82d4b9956d Add a test for TetheringUtils.setupNaSocket. 
Because most of the tethering tests are unprivileged, we cannot
test this code on real sockets. So use an AF_UNIX socketpair.

Bug: 154669942
Bug: 182785371
Test: test-only change
Change-Id: I843fddb3aaeab33628438f3bcd6a4166062de962
 2021-03-15 21:01:42 -07:00
Remi NGUYEN VAN
016e0b9261 Merge changes from topic "conn_resources_cp" 
* changes:
  Add ServiceConnectivityResources to in-process APEX
  Add ServiceConnectivityResources to tethering
 2021-03-16 02:29:31 +00:00
Aaron Huang
8369a74fab Update import class of TAG_SYSTEM_NEIGHBOR 
TrafficStatsConstants.TAG_SYSTEM_NEIGHBOR is moved to
NetworkStackConstants so update the import class name for it.

Bug: 182349970
Test: FrameworksNetTests
      NetworkStackTests
      TetheringTests
Ignore-AOSP-First: this topic needs to be cherry-picked manually
to AOSP to avoid automerging differences.

Change-Id: I8fcd2772ed873d318233d3029184e4352245d4cd
 2021-03-16 00:02:29 +08:00
Lorenzo Colitti
ba0fd02a29 Merge "Add test for RouterAdvertisementDaemon." am: e8e91c1726 am: 464a83c23f am: b5c74b7f55 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1485809

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia895fc8925ab6ff1ba925c299ae7345894341ede
 2021-03-15 15:10:03 +00:00
Lorenzo Colitti
88180f37b1 Merge "Do not open BPF maps when running on R." am: d12f867cb0 am: 9bcb23851b am: 9c1e719174 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1635300

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4d5236d220f0f4ec2eacabd05610af5c27ea5753
 2021-03-15 15:09:57 +00:00
Lorenzo Colitti
89c5bcf023 Merge "Add test for RouterAdvertisementDaemon." am: e8e91c1726 am: 464a83c23f 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1485809

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7e75b2e2d80949864ec98ba2dc91012a8bc73793
 2021-03-15 14:25:35 +00:00
Lorenzo Colitti
b0f7c1ce6a Merge "Do not open BPF maps when running on R." am: d12f867cb0 am: 9bcb23851b 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1635300

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idf409e9d933b5a92e90597bcc3d8e9f16fa17b70
 2021-03-15 14:25:29 +00:00
Lorenzo Colitti
b5c74b7f55 Merge "Add test for RouterAdvertisementDaemon." am: e8e91c1726 am: 464a83c23f 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1485809

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If012da4b4eb6b4aaf4999702708e63651cc9c249
 2021-03-15 14:24:59 +00:00
Lorenzo Colitti
9c1e719174 Merge "Do not open BPF maps when running on R." am: d12f867cb0 am: 9bcb23851b 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1635300

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I734b4e0ac01f3cb8d0cc3cbdad0cbcc2515d9a47
 2021-03-15 14:24:52 +00:00
Lorenzo Colitti
e8e91c1726 Merge "Add test for RouterAdvertisementDaemon." 2021-03-15 13:21:03 +00:00
Lorenzo Colitti
3c228f4923 Do not open BPF maps when running on R. 
Opening the maps on R devices is unnecessary (because no code
uses them) and unsafe (because the maps might actually be in a
different format than expected by the module).

Always return null when opening the maps, so the code will safely
fall back to using netd for anything.

This only affects dump(). The production code never opens the
maps except via the shim, and only the S shim opens the maps.
Also check isAtLeastS in dumpCounters, because it opens the map
directly.

Bug: 177884581
Test: builds, boots, "dumpsys tethering" shows expected output
Change-Id: I5884490a5cc40fc529a12100ae5baaeae6a18f30
 2021-03-15 10:44:53 +00:00
markchien
2af32e475f Add test for RouterAdvertisementDaemon. 
bug: 154669942
Test: atest TetheringPrivilegedTests
Change-Id: I2bbea720c486d6bb47a8d86375847894e2b2f390
 2021-03-15 08:20:57 +00:00
Remi NGUYEN VAN
235097b32b Merge "Update sources of Tethering module since it is renamed" am: e2c74e90a9 am: a564d023d0 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1626083

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieede28a14ecfca4969eabb8954336ee0e07491c3
 2021-03-15 02:48:59 +00:00
Remi NGUYEN VAN
e2c74e90a9 Merge "Update sources of Tethering module since it is renamed" 2021-03-15 01:32:47 +00:00
Remi NGUYEN VAN
2fb22c2a2b Add ServiceConnectivityResources to in-process APEX 
The APK was added to the standard APEX, but is missing in the
in-process APEX.

Bug: 182557971
Merged-In: Ic2491f04880ff66abc3b2d3aaee6168e18f6d68a
Merged-In: Ibf982ceb5f0fd61c822399e3eeeb1ef5e500604d

Change-Id: Ibf982ceb5f0fd61c822399e3eeeb1ef5e500604d
Test: m
 2021-03-14 12:33:30 +09:00
Greg Kaiser
c83707836d Merge "Add ServiceConnectivityResources to in-process APEX" into sc-dev 2021-03-12 17:05:22 +00:00
Lorenzo Colitti
ee6d2e8259 Merge "Add a test for upstream selection." am: f427d49541 am: 939d48f96c am: 9bb23d6b44 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1611320

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I439a25a8952e80cdc9fbd03b6eb881d9c729b204
 2021-03-12 16:01:32 +00:00
Lorenzo Colitti
9f8e962d48 Merge "Add a test for upstream selection." am: f427d49541 am: 939d48f96c 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1611320

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1f2430060ba0de9fa4d19fa290b31f114f72b13a
 2021-03-12 15:16:49 +00:00
Lorenzo Colitti
9bb23d6b44 Merge "Add a test for upstream selection." am: f427d49541 am: 939d48f96c 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1611320

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I661aa8582ded8e992aabb02b5cc403458e2b1508
 2021-03-12 15:14:41 +00:00
Remi NGUYEN VAN
f0f0ccad71 Add ServiceConnectivityResources to in-process APEX 
The APK was added to the standard APEX, but is missing in the
in-process APEX.

Bug: 182557971
Ignore-AOSP-First: corresponding change is not yet in AOSP
Change-Id: Ibf982ceb5f0fd61c822399e3eeeb1ef5e500604d
Test: m
 2021-03-12 15:08:03 +00:00
Lorenzo Colitti
f427d49541 Merge "Add a test for upstream selection." 2021-03-12 14:07:01 +00:00
Lorenzo Colitti
473399ceab Add a test for upstream selection. 
Currently, upstream selection is split between the Tethering and
UpstreamNetworkMonitor classes. The UpstreamNetworkMonitor bits
are unit tested, but there are no tests for the interaction of
the two. Add a simple test.

In order to do this, remove the code that controls the
UpstreamNetworkMonitor spy from prepareUsbTethering. This is so
that the new test can call prepareUsbTethering but still rely on
the behaviour of the actual UpstreamNetworkMonitor.

Bug: 173068192
Test: atest TetheringTests
Change-Id: If2ef9af82bc0cbff9172e575ad3d7686e5b492da
 2021-03-12 17:59:02 +09:00
Remi NGUYEN VAN
60f4c2f425 Add ServiceConnectivityResources to tethering 
The resource package is used by service-connectivity to load its own
resources.

Bug: 182125649
Test: atest FrameworksNetTests

Merged-In: I3c7fc6285f10318ecef05a64e1179054bb831d99
Merged-In: Ic2491f04880ff66abc3b2d3aaee6168e18f6d68a

Change-Id: I3c7fc6285f10318ecef05a64e1179054bb831d99
 2021-03-12 17:50:41 +09:00
Maciej Żenczykowski
546e9fa694 Merge changes from topic "attach_bpfprog_in_mainline" am: 3357388742 am: 5254c0c243 am: e9aa6a316d 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1607973

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia2c0dc2f0c5b93b9cf339ab6a1716ca57c0b49d5
 2021-03-12 02:33:10 +00:00
Hungming Chen
7c1973c98d [NFCT.TETHER.14] Clear the BPF maps in BpfCoordinator ctor am: 499d3cac73 am: 129077bd58 am: 9dba544999 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1623669

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icc33ff9ddc0306bf58df81ff9f6e9756817a1534
 2021-03-12 02:33:07 +00:00
Remi NGUYEN VAN
a5cc2cdee5 Merge "Add ServiceConnectivityResources to tethering" into sc-dev 2021-03-12 02:10:20 +00:00
Maciej Żenczykowski
e9aa6a316d Merge changes from topic "attach_bpfprog_in_mainline" am: 3357388742 am: 5254c0c243 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1607973

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8db0e2be24559a4b7b9ec51452ccb74ef51ae6a6
 2021-03-12 01:37:01 +00:00
Maciej Żenczykowski
f0424798ce Merge changes from topic "attach_bpfprog_in_mainline" am: 3357388742 am: 5254c0c243 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1607973

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I041c6fbd65444d1a01387038e0dfabb6b33944ba
 2021-03-12 01:37:01 +00:00
Hungming Chen
9dba544999 [NFCT.TETHER.14] Clear the BPF maps in BpfCoordinator ctor am: 499d3cac73 am: 129077bd58 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1623669

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I63ab27a10a04180ac9faf038350c36ff7aec71fe
 2021-03-12 01:37:00 +00:00
Hungming Chen
5af3ee5da0 [NFCT.TETHER.14] Clear the BPF maps in BpfCoordinator ctor am: 499d3cac73 am: 129077bd58 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1623669

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6d09c8f877c717670cf2e1462ec0146b1a0106dd
 2021-03-12 01:37:00 +00:00
Hungming Chen
129077bd58 [NFCT.TETHER.14] Clear the BPF maps in BpfCoordinator ctor am: 499d3cac73 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1623669

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I54098527fb72260c01c78d0b49282da4257f4a24
 2021-03-12 01:01:36 +00:00