Commit graph android_packages_modules_Co.../Tethering
Message SHA1
Merge "[Tetheirng] Refactor carrier config to EntitlementManager" am: 1135676150 am: 4ba3a8a6fb
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2033668

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

Tom Hsu   authored and   Automerger Merge Worker   commited 2022-04-21 14:27:04 +00:00
c83fee7adb
Merge "[Tetheirng] Refactor carrier config to EntitlementManager" am: 1135676150
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2033668

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

Tom Hsu   authored and   Automerger Merge Worker   commited 2022-04-21 14:04:25 +00:00
4ba3a8a6fb
Merge "[Tetheirng] Refactor carrier config to EntitlementManager"
Tom Hsu   authored and   Gerrit Code Review   commited 2022-04-21 13:43:14 +00:00
1135676150
[Tetheirng] Refactor carrier config to EntitlementManager
- To reduce CarrierConfigManager access times, move CarrierManager
  to TetheringConfiguration.

Bug: 225900149
Test: atest EntitlementManagerTest pass
Test: atest TetheringConfigurationTest pass
Change-Id: I5b206e2bc012cbbca26fb1e5c72558383981f183

tom hsu   commited 2022-04-21 12:44:26 +08:00
f0d60e9902
Merge "Add bpf forwording packet count test" am: faaaffc8a0 am: fecd68796d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2055845

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

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-04-20 12:33:28 +00:00
d045068993
Merge "Bump apex version to 33xxxxxx in tm-dev." into tm-dev
Artur Satayev   authored and   Android (Google) Code Review   commited 2022-04-20 12:23:22 +00:00
7a257d0f89
Merge "Add bpf forwording packet count test" am: faaaffc8a0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2055845

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

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-04-20 12:05:01 +00:00
fecd68796d
Merge "Tethering: replace argsContain with CollectionUtils.contains" am: 7cdc4a0769 am: 352247d5a6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2067236

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

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-04-20 11:27:50 +00:00
aeaf37b2a9
BpfCoordinator: Add an option to choose which raw bpf map to dump am: e4a6b28938 am: 9f5ffc3304
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2054365

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

Hungming Chen   authored and   Automerger Merge Worker   commited 2022-04-20 11:27:31 +00:00
ca3911831b
Merge "Tethering: replace argsContain with CollectionUtils.contains" am: 7cdc4a0769
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2067236

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

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-04-20 11:09:08 +00:00
352247d5a6
BpfCoordinator: Add an option to choose which raw bpf map to dump am: e4a6b28938
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2054365

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

Hungming Chen   authored and   Automerger Merge Worker   commited 2022-04-20 11:08:42 +00:00
9f5ffc3304
Add bpf forwording packet count test
- Add dumpsys option to dump stats map in BpfCoordinator
- Add stats test to check bpf forwording packet count in
  EthernetTetheringTest

Bug: 227159997
Test: atest TetheringCoverageTests
Change-Id: I177787ed0c28ebe137ff1431f40a23b1e4b22a19

Hungming Chen   authored and   Nucca Chen   commited 2022-04-20 08:54:08 +00:00
e32dbded7c
Tethering: replace argsContain with CollectionUtils.contains
Bug: 227159997
Test: adb shell dumpsys tethering --short
Change-Id: I6158d4cb4aecf9db4d7cc6698db898ce2cbb2c4c

Hungming Chen   authored and   Nucca Chen   commited 2022-04-20 08:53:49 +00:00
6abd0ff25d
BpfCoordinator: Add an option to choose which raw bpf map to dump
Make that tethering dumpsys can choose which map to dump.
The related functions in BpfCoordinator and its test are refactored
into template functions. This is used in the following commits which
will dump stats map for testing.

Bug: 227159997
Test: atest TetheringCoverageTests

Change-Id: I23d747543d16a971773c132b60227eb3f42efe25

Hungming Chen   commited 2022-04-20 15:58:47 +08:00
e4a6b28938
Merge "Fix R8 full mode for Tethering" am: 498919b44c am: c7b8a9a803
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2068439

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

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-04-20 07:43:46 +00:00
d9979d57ef
Merge "Fix R8 full mode for Tethering" am: 498919b44c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2068439

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

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-04-20 07:17:32 +00:00
c7b8a9a803
Merge "Fix R8 full mode for Tethering"
Treehugger Robot   authored and   Gerrit Code Review   commited 2022-04-20 06:39:13 +00:00
498919b44c
Merge "Add onSupportedTetheringType callback" am: c4379c2440 am: fb8dc55f47
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1940847

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

Mark Chien   authored and   Automerger Merge Worker   commited 2022-04-20 06:13:52 +00:00
5702c68944
Merge "Add onSupportedTetheringType callback" am: c4379c2440
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1940847

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

Mark Chien   authored and   Automerger Merge Worker   commited 2022-04-20 04:07:02 +00:00
fb8dc55f47
Merge "Add onSupportedTetheringType callback"
Mark Chien   authored and   Gerrit Code Review   commited 2022-04-20 03:38:42 +00:00
c4379c2440
Fix R8 full mode for Tethering
Ensure runtime-visible field annotations are properly preserved
when using R8 full mode.

Bug: 215530220
Change-Id: I3d09fa122a03e5c86cbefc68e7dfabd56241dcfe
Test: m + presubmit

Jared Duke   commited 2022-04-19 21:45:05 +00:00
4ed9942546
Add onSupportedTetheringType callback
This new callback could tell caller Tethering is supported for what tethering
types.

Bug: 184996041
Test: atest TetheringTests
      atest EthernetTetheringTest
CTS-Coverage-Bug: 223340235

Change-Id: Ib80ed8d7f73f4a098b8965db186d24d8cf1884d3

markchien   commited 2022-04-20 00:41:41 +08:00
ae3d303344
Bump apex version to 33xxxxxx in tm-dev.
Bug: 229359315
Test: m && launch_cvd; presubmit
Change-Id: I7a98dd6d56db43acd243bf7f854ed43e13a0c1c8

satayev   commited 2022-04-19 14:34:32 +01:00
3557ec60c0
Merge "Move TetherStatsKey and TetherStatsValue to common libs" am: 8315d1cf03 am: 00882a40a6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2054166

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

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-04-19 09:34:48 +00:00
54c77de080
Merge "Move TetherStatsKey and TetherStatsValue to common libs" am: 8315d1cf03
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2054166

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

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-04-19 08:52:16 +00:00
00882a40a6
Merge "Move TetherStatsKey and TetherStatsValue to common libs"
Treehugger Robot   authored and   Gerrit Code Review   commited 2022-04-19 08:35:03 +00:00
8315d1cf03
Merge "Filter out excluded routes in LinkProperties" am: ac8935bee7 am: bb8601a015
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1619104

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

Taras Antoshchuk   authored and   Automerger Merge Worker   commited 2022-04-13 13:47:24 +00:00
819056e0b8
Merge "Filter out excluded routes in LinkProperties" am: ac8935bee7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1619104

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

Taras Antoshchuk   authored and   Automerger Merge Worker   commited 2022-04-13 12:45:04 +00:00
bb8601a015
Filter out excluded routes in LinkProperties
Gate presence of excluded routes in LinkProperties on target sdk T.

Bug: 186082280
Test: atest LinkPropertiesTest
Change-Id: If8fdb468a0a4968c5f2a878b7aacfeb4f7d9a9e5

Taras Antoshchuk   commited 2022-04-13 01:17:56 +02:00
30d41e59bc
Merge "ConnectivityCoverageTests refactoring" am: 1ae9c4ad07 am: 3134ed2b19
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2052986

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

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2022-04-07 02:03:30 +00:00
701cb3b54a
Merge "ConnectivityCoverageTests refactoring" am: 1ae9c4ad07
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2052986

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

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2022-04-07 01:41:01 +00:00
3134ed2b19
Merge "ConnectivityCoverageTests refactoring"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2022-04-07 01:22:17 +00:00
1ae9c4ad07
ConnectivityCoverageTests refactoring
ConnectivityCoverageTests is a combination of several test libs, which
are jarjared differently. It causes duplicated classes not to be counted
for coverage properly. Build the test suite directly and apply jarjar
only once on top of everything.

Bug: 227694415
Test: atest ConnectivityCoverageTests

Change-Id: I4350ebdbf98030944ec3857e1ef67d76f26c3b16

markchien   authored and   Remi NGUYEN VAN   commited 2022-04-06 19:35:28 +09:00
e59f5e36e5
Merge "Add config_p2p_leases_subnet_prefix_length configuration" am: 60f25d6c5b am: b88aea2c58
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1999082

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

Mark Chien   authored and   Automerger Merge Worker   commited 2022-04-06 10:00:27 +00:00
20ede05369
Merge "Add config_p2p_leases_subnet_prefix_length configuration" am: 60f25d6c5b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1999082

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

Mark Chien   authored and   Automerger Merge Worker   commited 2022-04-06 09:25:41 +00:00
b88aea2c58
Merge "Add config_p2p_leases_subnet_prefix_length configuration"
Mark Chien   authored and   Gerrit Code Review   commited 2022-04-06 09:14:19 +00:00
60f25d6c5b
Merge "Remove implementation details from tethering hidden api flags" am: a2e04105bb
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2020995

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

Paul Duffin   authored and   Automerger Merge Worker   commited 2022-04-06 07:18:43 +00:00
6702bec2a8
Remove tabs that have been removed downstream
Change https://r.android.com/2020995 was a cherry pick of a downstream
change that was updated to remove these tabs. Unfortunately, the
cherry pick was not updated to match making this change necessary to
ensure consistency.

Bug: 194063708
Test: m out/soong/hiddenapi/hiddenapi-flags.csv
Change-Id: Id03bbbb749eb91a4f26b5c12b77eed03a72a83c4
Merged-In: Iaa1207799a44ab892dc30b55f363c6e7deb94d86

Paul Duffin   commited 2022-04-06 08:01:23 +01:00
7327f2cc1f
Merge "Remove implementation details from tethering hidden api flags"
Paul Duffin   authored and   Gerrit Code Review   commited 2022-04-06 06:51:07 +00:00
a2e04105bb
Move TetherStatsKey and TetherStatsValue to common libs
EthernetTetheringTest needs to parse BPF map content for bpf stats
tests. Move the struct class files to common libs.

Compare TetherStats{Key, Value}.java between frameworks/libs/net/common
and packages/modules/Connectivity/Tethering.
There is only the package name change as expected.

$ diff packages/modules/Connectivity/Tethering/src/com/android/networkstack/tethering/TetherStatsKey.java frameworks/libs/net/common/device/com/android/net/module/util/bpf/TetherStatsKey.java
17c17
< package com.android.networkstack.tethering;

Bug: 227159997
Test: atest TetheringCoverageTests

Change-Id: I87193cb6409b4d19c72184011d7e99275800dab1

Hungming Chen   commited 2022-04-04 23:25:58 +08:00
87bb6c3603
Remove implementation details from tethering hidden api flags
Ran the following to compute the set of split_packages and
package_prefixes properties.
    m analyze_bcpf &&
    analyze_bcpf --bcpf com.android.tethering-bootclasspath-fragment --apex framework-tethering --sdk tethering-module-sdk

Bug: 194063708
Test: m out/soong/hiddenapi/hiddenapi-flags.csv
Change-Id: Iaa1207799a44ab892dc30b55f363c6e7deb94d86
Merged-In: Iaa1207799a44ab892dc30b55f363c6e7deb94d86

Paul Duffin   commited 2022-04-04 16:17:51 +01:00
a0c49bcc2c
Merge changes from topic "block_port" am: 6de87582c1 am: 5ba013208f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2008366

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

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2022-04-01 22:36:20 +00:00
5296a491bf
Merge changes from topic "block_port" am: 6de87582c1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2008366

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

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2022-04-01 22:13:32 +00:00
5ba013208f
Merge changes from topic "block_port"
* changes:
  Add connectivity_native_test to Presubmit
  Vendor AIDL interface for port blocking via eBPF

Lorenzo Colitti   authored and   Gerrit Code Review   commited 2022-04-01 21:46:37 +00:00
6de87582c1
Merge "Remove implementation details from tethering hidden api flags" into tm-dev
Paul Duffin   authored and   Android (Google) Code Review   commited 2022-04-01 10:35:44 +00:00
3d6c90bf0c
Merge "Adding Tethering proto" am: 075dd6f8ff am: cd4493204a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2024488

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

Wayne Ma   authored and   Automerger Merge Worker   commited 2022-03-31 16:53:51 +00:00
f362290cc2
Merge "Adding Tethering proto" am: 075dd6f8ff
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2024488

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

Wayne Ma   authored and   Automerger Merge Worker   commited 2022-03-31 16:39:22 +00:00
cd4493204a
Merge "Adding Tethering proto"
Wayne Ma   authored and   Gerrit Code Review   commited 2022-03-31 16:24:16 +00:00
075dd6f8ff
Add config_p2p_leases_subnet_prefix_length configuration
Add new rro configuration which can be used to make the p2p dhcp
prefix length larger to reserve the address range outside of leases
subnet prefix length for EAPOL-Key feature. This configuration only
valid if its value larger than dhcp server address prefix length and
config_tether_enable_legacy_wifi_p2p_dedicated_ip is true.
E.g.:leaseSubnetPrefixLength = 25, p2p static address = 192.168.49.1/24
dhcp range: 192.168.49.0 ~ 192.168.49.127 (192.168.49.1/25), reserved
192.168.49.128 ~ 192.168.49.255 for EAPOL-Key feature.

Bug: 170056953
Test: atest TetheringTests

Change-Id: I1319efd871796da7234383a29ab64a1623101ae7

markchien   commited 2022-03-31 16:32:55 +08:00
fb65dfeb8d
Add test for tetherOffloadClient{Add, Remove, Clear} am: dad664748a am: 1dcbf69053
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1744606

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

Hungming Chen   authored and   Automerger Merge Worker   commited 2022-03-30 12:27:44 +00:00
ee7bd4eab6