Commit graph

65,382 commits

Message SHA1
Merge "Use frameworks/libs/net version of SharedLog" am: d5c6a891b4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2129981

Change-Id: I7ea6d753680102d1440e6b24d37a136d3ff4225b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Xiao Ma   authored and   Automerger Merge Worker   commited 2022-07-08 07:16:54 +00:00
7ca4bb0c7f
Merge "Use frameworks/libs/net version of SharedLog"
Xiao Ma   authored and   Gerrit Code Review   commited 2022-07-08 06:55:04 +00:00
d5c6a891b4
Merge "Setting apex version to the placeholder value" am: 0dce8e551e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2143792

Change-Id: I7521ccebf1dac704b6081989c32b07b4bf09a98c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-07-08 02:45:15 +00:00
e4c50fa0fa
Merge "Setting apex version to the placeholder value"
Treehugger Robot   authored and   Gerrit Code Review   commited 2022-07-08 02:27:29 +00:00
0dce8e551e
NetworkProvider: add missing synchronization am: aecfab5f72
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2148673

Change-Id: I24349ba44e347d3359a3fd2c9f6a7cd84b0fb725
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Patrick Rohr   authored and   Automerger Merge Worker   commited 2022-07-07 23:59:58 +00:00
617e2ba73a
NetworkProvider: add missing synchronization
Adding missing lock to unregisterNetworkOffer() call.

Test: TH
Change-Id: Ia54664caaecb63e0bfa737903b48d08856fb4877

Patrick Rohr   commited 2022-07-07 13:48:52 -07:00
aecfab5f72
Use frameworks/libs/net version of SharedLog
Test: m
Bug: 235901424
Change-Id: Ibfa7821c68c41036a47e765f15078cd5d195afb8

Patrick Rohr   commited 2022-07-07 12:52:58 -07:00
b873e25ab4
Setting apex version to the placeholder value
When the apex version is set to 0, the version number will be replaced by the build system to the default value for the current branch.
The default value for mainline module manifest version is stored in the defaultManifestVersion constant: https://android.googlesource.com/platform/build/soong/+/refs/heads/master/apex/constants.go#36

The version should not be changed manually in the manifest. Release tooling will set this version to the release version on the release branches.

Test: presubmit
Bug: 231691643
Change-Id: I30b5b486bca521ebdeed17dba7afc61f2c529ab8
Merged-In: I30b5b486bca521ebdeed17dba7afc61f2c529ab8

Alexei Nicoara   commited 2022-07-07 11:29:39 +01:00
b02a2266cd
Merge "BpfNetworkStats - remove spurious code & use static maps" am: 567b664d90
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2134066

Change-Id: Ib1b5aaba2d075993d254e974efb7a1cf0cba3125
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-07-06 21:08:39 +00:00
2dbd1a42f5
Merge "BpfNetworkStats - remove spurious code & use static maps"
Treehugger Robot   authored and   Gerrit Code Review   commited 2022-07-06 20:45:33 +00:00
567b664d90
Merge "Use BpfDump.toBase64EncodedString to dump raw map" am: bf28a595f2
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2133440

Change-Id: Ie93ca0ae78bff00eea862a7670145b5e51773ee1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Nucca Chen   authored and   Automerger Merge Worker   commited 2022-07-06 12:22:02 +00:00
1ebaa587ba
Merge "Use BpfDump.toBase64EncodedString to dump raw map"
Nucca Chen   authored and   Gerrit Code Review   commited 2022-07-06 12:04:54 +00:00
bf28a595f2
Merge "Reword comment for language quality" am: e79157578b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2001254

Change-Id: Ieed3572889aeabb0c6b6e3f96aee7a895dde82ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Paul Hu   authored and   Automerger Merge Worker   commited 2022-07-06 02:10:31 +00:00
d515cb78e4
Merge "Reword comment for language quality"
Paul Hu   authored and   Gerrit Code Review   commited 2022-07-06 01:52:06 +00:00
e79157578b
Reword comment for language quality
This addresses a leftover comment to aosp/1919251

Bug: 238139913
Test: comment-only
Change-Id: Icfd054a1f9a4b928b222fb1a74af066c36c886b0

Chalard Jean   authored and   Paul Hu   commited 2022-07-06 01:51:35 +00:00
2ddcf603e2
Merge "ClatCoordinator: Dump ClatdTracker information" am: 78cf7c5e29
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2145582

Change-Id: I9dc2bbabb924e0fe97c28c454d5a6c697792876e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-07-05 15:20:52 +00:00
011b8dca41
Merge "ClatCoordinator: Dump ClatdTracker information"
Treehugger Robot   authored and   Gerrit Code Review   commited 2022-07-05 15:01:11 +00:00
78cf7c5e29
ClatCoordinator: Dump ClatdTracker information
Test: atest ClatCoordinatorTest
Change-Id: I6bb47c84321e1323496b728f2db939ee8d74504a

Hungming Chen   commited 2022-07-05 15:30:50 +08:00
a760a10474
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
TreeHugger Robot   authored and   Android (Google) Code Review   commited 2022-07-05 00:45:36 +00:00
e1b04ca655
Merge "Remove unnecessary null check" am: daced9e4b8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2138293

Change-Id: Iff508925baf00ae327d94a666cc1fb22726b94d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-07-04 18:57:15 +00:00
be5920c6cd
Merge "Remove unnecessary null check"
Treehugger Robot   authored and   Gerrit Code Review   commited 2022-07-04 18:37:07 +00:00
daced9e4b8
Merge "Add @RequiresApi to LocationPermissionChecker" am: 07bb1d41d8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2138302

Change-Id: I184283d0d34c5fff65eabb79d8966871fadb9d79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-07-04 14:30:02 +00:00
3e66f7d941
Merge "Add @RequiresApi to LocationPermissionChecker"
Treehugger Robot   authored and   Gerrit Code Review   commited 2022-07-04 14:01:20 +00:00
07bb1d41d8
Merge "Move struct {Clat*, Tether4*, TetherStats*} to connectivity module" am: 7722b024a1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2138535

Change-Id: I58c76123da5c986c6c86bdb545ea358fa6836c4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-07-04 12:31:02 +00:00
851d4311ec
Merge "Move struct {Clat*, Tether4*, TetherStats*} to connectivity module"
Treehugger Robot   authored and   Gerrit Code Review   commited 2022-07-04 12:17:20 +00:00
7722b024a1
Log BPF programs & maps in bugreport am: daf5cb64cc
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2144639

Change-Id: Ibc11e6ae6eee1deaa07f716d46f720598d03ce31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Ken Chen   authored and   Automerger Merge Worker   commited 2022-07-04 09:55:57 +00:00
92cc7db2f8
Remove unnecessary null check
Address review comments from aosp/2131752 and aosp/2117045
sConfigurationMap must have a entry for UID_RULES_CONFIGURATION_KEY
because this bpf map is an array

Bug: 217624062
Test: atest BpfNetMapsTest
Change-Id: Ic52623e11c1f53e363416d57c0d8705d5510ef04

Motomu Utsumi   commited 2022-07-04 09:20:23 +00:00
1f73fedfef
Log BPF programs & maps in bugreport
Currently (T+), BPF program and map status are only dumped on demand.
$ adb shell dumpsys connectivity trafficcontroller

The information can be useful for issue debugging, especially on Data
Usage and NetworkPolicyManagerService. It should be logged in bugreport
dumpsys connectivity section as Android S (which is handled by netd).

Bug: 237954856
Test: adb bugreport
Change-Id: Ic02a58ff2ebdbf375d9df0917e8218ab8faa96da

Ken Chen   commited 2022-07-04 11:32:44 +08:00
daf5cb64cc
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I93fe2333b8bd95c6002e67c00fdd932f9586bfe6

Bill Yi   commited 2022-07-03 12:35:54 -07:00
a7abb9fcac
Merge changes I3250bdb9,I20f6e5e1,I70c96a09,I88f77bd4,If6cefa51, ... am: eae7873814
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2132998

Change-Id: I15e95bb16a182d0bbc5c3e3ad222d1bbf4738df1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Patrick Rohr   authored and   Automerger Merge Worker   commited 2022-07-01 23:15:34 +00:00
29b87b830b
Merge changes I3250bdb9,I20f6e5e1,I70c96a09,I88f77bd4,If6cefa51, ...
* changes:
  ethernet: rename methods in EthernetNetworkFactory
  ethernet: move registerNetworkOffer into its own function
  ethernet: provider to keep track of requestId
  ethernet: return result when removing interface
  ethernet: enable testCallbacks_forServerModeInterfaces on CF
  ethernet: expand server mode callbacks test
  ethernet: add test for removing interface while in server mode

Patrick Rohr   authored and   Gerrit Code Review   commited 2022-07-01 23:03:24 +00:00
eae7873814
ethernet: rename methods in EthernetNetworkFactory
For clarity, renaming the following functions:
getBestNetworkScore() -> getNetworkScore()
destroy() -> unregisterNetworkOfferAndStop()

This is more inline with their behavior and the other functions in
EthernetNetworkFactory.

Test: TH
Change-Id: I3250bdb91e15433ce89354bed46d011f634f3da5

Patrick Rohr   commited 2022-07-01 11:48:24 -07:00
bb8b44e127
ethernet: move registerNetworkOffer into its own function
Doing this makes the code much more readable.

Per suggestion in aosp/2059590.

Test: TH
Change-Id: I20f6e5e10bae717ddd3d6cbc62b6b187854dbcd3

Patrick Rohr   commited 2022-07-01 11:48:24 -07:00
6ae808eead
ethernet: provider to keep track of requestId
Keeping track of request ids instead of the entire NetworkRequest is
slightly more efficient.

Per suggestion in aosp/2059590.

Test: TH
Change-Id: I70c96a09d8f011d7b59852f2e9798154ee91c6d8

Patrick Rohr   commited 2022-07-01 11:48:24 -07:00
b9f73c8f67
ethernet: return result when removing interface
This is not used yet, but is consistent with the other
EthernetNetworkFactory APIs and will come in handy soon as logging and
error handling is expanded. Also removing NetworkProvider from the class
documentation as EthernetNetworkFactory does not inherit from it.

This change was suggested in aosp/2059590.

Test: TH
Change-Id: I88f77bd461d50d5df73164560bc5a8395e584d05

Patrick Rohr   commited 2022-07-01 11:48:24 -07:00
dcf73e8973
ethernet: enable testCallbacks_forServerModeInterfaces on CF
testCallbacks_forServerModeInterfaces was previously skipped on CF as
isAdbOverNetwork() was true. The existing interface on CF has configured
NetworkCapabilities which excludes it from being used in tethering.
Using assumeNoInterfaceForTetheringAvailable() is therefore a better
assumption check for this test.

Test: atest EthernetManagerTest
Change-Id: If6cefa519b32d041c8dccc0a58acb3028eefd878

Patrick Rohr   commited 2022-07-01 11:48:24 -07:00
525c30205c
ethernet: expand server mode callbacks test
Bug: 236895792
Test: atest EthernetManagerTest
Change-Id: Ib74fc0689592ebce7247d5f36a60b68ede6713a9

Patrick Rohr   commited 2022-07-01 11:48:24 -07:00
43fa51ca2e
ethernet: add test for removing interface while in server mode
Bug: 236892130
Test: atest EthernetManagerTest#testRemoveInterface_whileInServerMode
Change-Id: I3ca71cd87301da8e96d31f7632b69d318ee97d4a

Patrick Rohr   commited 2022-07-01 11:48:20 -07:00
f34945bf6f
Merge "DscpPolicy Move to kernel 5.15" am: b3ec6329e7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2141233

Change-Id: Ide70a39a798d6f609104c305577a75f788d72105
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-07-01 16:12:23 +00:00
7921079cf8
Merge "DscpPolicy Move to kernel 5.15"
Treehugger Robot   authored and   Gerrit Code Review   commited 2022-07-01 15:55:10 +00:00
b3ec6329e7
DscpPolicy Move to kernel 5.15
Require at least kernel 5.15. Feature is not required on older
kernels and may impact boot time unnecessarily.

Bug: 235559605
Change-Id: I2e4b509de1d8940fc63ae057a8326f13c0fd1420

Tyler Wear   commited 2022-06-30 19:41:03 +00:00
a8ca597aec
Merge "Refactor BpfNetMaps and getChainEnabled" am: 51a03d629e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2135061

Change-Id: Ia3e745d43be4f20af2c7b68f9628e9bb2b3d1003
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Motomu Utsumi   authored and   Automerger Merge Worker   commited 2022-06-30 07:09:35 +00:00
1608aed5c7
Merge "Refactor BpfNetMaps and getChainEnabled"
Motomu Utsumi   authored and   Gerrit Code Review   commited 2022-06-30 06:48:10 +00:00
51a03d629e
Merge "Decouple security exception check test from ConnectivityServiceTest" am: bb2e871cce
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2133162

Change-Id: Iffad1426c2939aa7fa9b773a695870ab1cdb542d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Chiachang Wang   authored and   Automerger Merge Worker   commited 2022-06-30 02:00:38 +00:00
c568a0e522
Merge changes from topic "appExclusionPackage" am: 5b4ad7c47a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2106025

Change-Id: Ica923dd09dbe9963296f1aa0917106ae090ad52a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Chiachang Wang   authored and   Automerger Merge Worker   commited 2022-06-30 02:00:10 +00:00
8003ddb079
Add VpnTestBase for VPN test common code am: 9f672bdae6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2138296

Change-Id: I23385dae07b0f62d4613eb386867c5c4a91f2da8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

chiachangwang   authored and   Automerger Merge Worker   commited 2022-06-30 02:00:07 +00:00
4a1860836d
Merge "Decouple security exception check test from ConnectivityServiceTest"
Chiachang Wang   authored and   Gerrit Code Review   commited 2022-06-30 01:36:46 +00:00
bb2e871cce
Merge changes from topic "appExclusionPackage"
* changes:
  Test VPN app exclusion
  Add VpnTestBase for VPN test common code

Chiachang Wang   authored and   Gerrit Code Review   commited 2022-06-30 01:34:54 +00:00
5b4ad7c47a
Merge "Merge tm-dev-plus-aosp-without-vendor@8763363" into stage-aosp-master
Xin Li   authored and   Android (Google) Code Review   commited 2022-06-29 21:22:03 +00:00
514698c728
Move struct {Clat*, Tether4*, TetherStats*} to connectivity module
Needed because these struct classes should not be exposed.
Only used for the connectivity module and its tests.

Bug: 234160319
Test: atest ConnectivityCoverageTests

The moved files are identical.

diff packages/modules/Connectivity/common/src/com/android/net/module/util/bpf/ClatEgress4Key.java frameworks/libs/net/common/device/com/android/net/module/util/bpf/ClatEgress4Key.java
diff packages/modules/Connectivity/common/src/com/android/net/module/util/bpf/ClatEgress4Value.java frameworks/libs/net/common/device/com/android/net/module/util/bpf/ClatEgress4Value.java
diff packages/modules/Connectivity/common/src/com/android/net/module/util/bpf/ClatIngress6Key.java frameworks/libs/net/common/device/com/android/net/module/util/bpf/ClatIngress6Key.java
diff packages/modules/Connectivity/common/src/com/android/net/module/util/bpf/ClatIngress6Value.java frameworks/libs/net/common/device/com/android/net/module/util/bpf/ClatIngress6Value.java
diff packages/modules/Connectivity/common/src/com/android/net/module/util/bpf/Tether4Key.java frameworks/libs/net/common/device/com/android/net/module/util/bpf/Tether4Key.java
diff packages/modules/Connectivity/common/src/com/android/net/module/util/bpf/Tether4Value.java frameworks/libs/net/common/device/com/android/net/module/util/bpf/Tether4Value.java
diff packages/modules/Connectivity/common/src/com/android/net/module/util/bpf/TetherStatsKey.java frameworks/libs/net/common/device/com/android/net/module/util/bpf/TetherStatsKey.java
diff packages/modules/Connectivity/common/src/com/android/net/module/util/bpf/TetherStatsValue.java frameworks/libs/net/common/device/com/android/net/module/util/bpf/TetherStatsValue.java
diff packages/modules/Connectivity/common/src/com/android/net/module/util/bpf/ClatEgress4Key.java frameworks/libs/net/common/device/com/android/net/module/util/bpf/ClatEgress4Key.java
(no diff)

Change-Id: I4ce8045150bdbf04c63c5262c58a0ebcc30d395c

Hungming Chen   authored and   Nucca Chen   commited 2022-06-29 11:34:19 +00:00
01f2550ac4