Commit graph

57,590 commits

Message SHA1
Merge changes from topic "MDns_AIDL" am: 09475308b7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2049246

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

Paul Hu   authored and   Automerger Merge Worker   commited 2022-04-07 02:42:02 +00:00
06e59627bb
Merge changes from topic "MDns_AIDL"
* changes:
  Use MDns aidl on NsdService
  Add MDnsManager

Paul Hu   authored and   Gerrit Code Review   commited 2022-04-07 02:06:35 +00:00
09475308b7
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
add OWNERS for connectivity_native_test am: 189577cd8b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2057745

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

Maciej Żenczykowski   authored and   Automerger Merge Worker   commited 2022-04-07 01:40:37 +00:00
ce83507437
Merge "ConnectivityCoverageTests refactoring"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2022-04-07 01:22:17 +00:00
1ae9c4ad07
add OWNERS for connectivity_native_test
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ibb7bcf272a2ff258d2518b60589ecb8e16823777

Maciej Żenczykowski   commited 2022-04-06 23:25:10 +00:00
189577cd8b
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
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 "Allow the bluetooth UID to register network factories." am: a79559084b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2056066

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

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2022-04-06 09:25:11 +00:00
d5b5d988dc
[automerger skipped] Remove tabs that have been removed downstream am: 7327f2cc1f -s ours
am skip reason: Merged-In Iaa1207799a44ab892dc30b55f363c6e7deb94d86 with SHA-1 a0c49bcc2c is already in history

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

Change-Id: I5b1ad1b3eedbaf2cec80f61765ae31d4ceb482c0
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 09:24:59 +00:00
f2ce56aab2
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 "Allow the bluetooth UID to register network factories."
Lorenzo Colitti   authored and   Gerrit Code Review   commited 2022-04-06 09:08:47 +00:00
a79559084b
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
Merge "Add test for Ikev2VpnProfile.getIkeTunnelConnectionParams" am: ed714f4d17
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2047083

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

Chiachang Wang   authored and   Automerger Merge Worker   commited 2022-04-06 05:54:52 +00:00
4ff7ce7a98
Merge "Add test for Ikev2VpnProfile.getIkeTunnelConnectionParams"
Chiachang Wang   authored and   Gerrit Code Review   commited 2022-04-06 05:28:56 +00:00
ed714f4d17
Allow the bluetooth UID to register network factories.
This ensures that bluetooth can register bluetooth tethering
NetworkAgents without having to make NETWORK_FACTORY a privileged
or role permission.

Test: m
Bug: 221949454
Change-Id: I24a5da444b10dde740c1e449c8630de56946d4e1

Lorenzo Colitti   commited 2022-04-06 11:15:12 +09:00
d12af7ebfe
Merge changes Iafa8979d,I44eac159,I27ad3298 am: 6097358382
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2042596

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

Maciej Żenczykowski   authored and   Automerger Merge Worker   commited 2022-04-06 00:58:44 +00:00
ec84e33d10
Merge changes Iafa8979d,I44eac159,I27ad3298
* changes:
  Address EthernetManager javadoc review comments
  Update javadoc to match expectation for UnsupportedOperationException
  Fix linter errors

Maciej Żenczykowski   authored and   Gerrit Code Review   commited 2022-04-06 00:39:28 +00:00
6097358382
Merge "data saver test exception for wear" am: f900a64af4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2046843

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

Andriy Naborskyy   authored and   Automerger Merge Worker   commited 2022-04-06 00:10:03 +00:00
11d1a17808
Merge "data saver test exception for wear"
Andriy Naborskyy   authored and   Gerrit Code Review   commited 2022-04-05 23:46:28 +00:00
f900a64af4
Merge "Increase the temp-allowlist duration in tests" am: 63ef37647e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2053428

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

Sudheer Shanka   authored and   Automerger Merge Worker   commited 2022-04-04 22:11:01 +00:00
8d5cde987f
Merge "Increase the temp-allowlist duration in tests"
Sudheer Shanka   authored and   Gerrit Code Review   commited 2022-04-04 21:39:03 +00:00
63ef37647e
Use MDns aidl on NsdService
- Use MDns aidl to communicate with mdns service and register
  event listener to receive callback.
- Remove all NDC relevant code on NsdService.
- Use MDns aidl on NsdServiceTest.

Bug: 209894875
Test: atest FrameworksNetTests CtsNetTestCases
Change-Id: I65929dee3838fef753396e86c665abd66b6fec81

paulhu   commited 2022-04-04 15:18:27 +00:00
2b9ed95ae5
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
Add MDnsManager
- Have MDnsManager to manage mdns native service binder call.
- Register it as a system service for NsdService.
- NsdService will use aidl to communicate with mdns, so add the
  relevant lib to framework-connectivity
- Add jarjar rule for mdns-aidl-interface classes.

Bug: 209894875
Test: atest FrameworksNetTests CtsNetTestCases
Change-Id: Ibc8b726c01a15015b450caf94d0afed570117b7f

paulhu   commited 2022-04-04 15:02:17 +00:00
541b72d03b
Address EthernetManager javadoc review comments
Test: TH
Change-Id: Iafa8979d8e96ea4d078b017e56ee61334d33b5f5

Patrick Rohr   commited 2022-04-04 14:59:42 +02:00
50c470e308
Update javadoc to match expectation for UnsupportedOperationException
Test: builds
Change-Id: I44eac15972ed099fc12599a78a71557a7b16d593

Patrick Rohr   commited 2022-04-04 14:59:42 +02:00
0f2cbe92f1
Fix linter errors
Test: TH
Change-Id: I27ad329811a4794050b25976e79909ce8c57d7a3

Patrick Rohr   commited 2022-04-04 14:59:31 +02:00
ddc2622ec7
[automerger skipped] Merge "Merge EthernetServiceTests into FrameworksNetTests" am: 82ef475266 -s ours
am skip reason: Merged-In Id533cdb4ac184b963f570af299dea04754ba88e9 with SHA-1 6ad9287432 is already in history

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

Change-Id: I4907a1d2adb036ccbd72c84c2af23d23f51d4925
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-04 08:19:16 +00:00
e279a2e225
[automerger skipped] Merge EthernetServiceTests into FrameworksNetTests am: 40da62da48 -s ours
am skip reason: Merged-In Id533cdb4ac184b963f570af299dea04754ba88e9 with SHA-1 6ad9287432 is already in history

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

Change-Id: Ideadee4f7b73110321dffe3e78d80241c3fe8109
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-04 08:19:12 +00:00
198ba0cda3
Merge "Merge EthernetServiceTests into FrameworksNetTests"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2022-04-04 08:02:04 +00:00
82ef475266
Increase the temp-allowlist duration in tests
It is possible there is a delay in app getting to
the background state and then initiating network
activity. We need the app to stay in the
temp allowlist until then.

Fixes: 227418169
Test: atest tests/cts/hostside/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
Change-Id: I6a98cc17a40cfb54bf3e12f51b5584159e69be0c

Sudheer Shanka   commited 2022-04-02 21:05:51 +00:00
5b63b6c107
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 changes Id533cdb4,I6a9ce3d6,I345bf073 into sc-mainline-prod
* changes:
  Merge EthernetServiceTests into FrameworksNetTests
  Prevent building T+ sources on sc-mainline-prod
  Add framework-t, service-t to sc-mainline prod

Remi NGUYEN VAN   authored and   Android (Google) Code Review   commited 2022-04-01 08:15:53 +00:00
c3315f2560
Merge EthernetServiceTests into FrameworksNetTests
As per the TODO, merge EthernetServiceTests into the larger
FrameworksNetTests suite.

Similarly to NetworkStats, NSD or IpSec tests, the tests are also marked
as "non-connectivity-module-test", where "module" actually refers to
modules being built for release (from an S-based branch) today. This is
necessary as the tests and associated code cannot build without T APIs.

Also add FrameworksNetTests to presubmit as non-connectivity-module
tests are not run in presubmit without this.

Test: TH
Merged-In: Id533cdb4ac184b963f570af299dea04754ba88e9
Change-Id: I9950fcb49fdc2217134a59e993941cbe5da0b556

Remi NGUYEN VAN   commited 2022-04-01 15:12:18 +09:00
40da62da48
Merge EthernetServiceTests into FrameworksNetTests
As per the TODO, merge EthernetServiceTests into the larger
FrameworksNetTests suite.

Similarly to NetworkStats, NSD or IpSec tests, the tests are also marked
as "non-connectivity-module-test", where "module" actually refers to
modules being built for release (from an S-based branch) today. This is
necessary as the tests and associated code cannot build without T APIs.

Also add FrameworksNetTests to presubmit as non-connectivity-module
tests are not run in presubmit without this.

Test: TH
Ignore-AOSP-First: Merged in topic, will be cherry-picked
Change-Id: Id533cdb4ac184b963f570af299dea04754ba88e9

Remi NGUYEN VAN   commited 2022-04-01 15:08:48 +09:00
6ad9287432
Prevent building T+ sources on sc-mainline-prod
Points service-connectivity-tiramisu-sources to empty stubs instead.

Test: TH
Merged-In: I06e2568e5e01d855783383552d1b0d7732cefbe0
Change-Id: I6a9ce3d6f6f430576c54fa1171b43d2dff18e6e0

Patrick Rohr   authored and   Remi NGUYEN VAN   commited 2022-04-01 12:58:37 +09:00
156d93325a
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 framework-t, service-t to sc-mainline prod
Ignores changes to the following files:
- Tethering/apex/Android.bp
- framework-t/Android.bp
- service-t/Android.bp
- service/Android.bp
- tests/deflake/Android.bp
- tests/unit/Android.bp

Test: TH
Merged-In: I06e2568e5e01d855783383552d1b0d7732cefbe0
Change-Id: I345bf07369b7f7025626e8e924f3bafa92c0d54f

Patrick Rohr   commited 2022-03-31 16:12:14 +02:00
cc97aed683
[automerger skipped] Remove connectivity-tiramisu-updatable-sources am: 86bbfe9271 -s ours
am skip reason: Merged-In I3e5df1bd44defbb9dd0c382c625a21e176368f2a with SHA-1 19100e4ab4 is already in history

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

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

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2022-03-31 12:33:09 +00:00
90422ee988
[automerger skipped] Merge history of opt/net/ethernet am: e99dcfd4dd -s ours
am skip reason: Merged-In I3e5df1bd44defbb9dd0c382c625a21e176368f2a with SHA-1 19100e4ab4 is already in history

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

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

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2022-03-31 12:33:06 +00:00
3b51e9a994
[automerger skipped] Remove connectivity-tiramisu-updatable-sources am: 86bbfe9271 -s ours
am skip reason: Merged-In I770bf8db3f4c18467934eb2184f5dc2408fc28ec with SHA-1 f4905eb1d1 is already in history

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

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

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2022-03-31 12:32:34 +00:00
38efad414e
[automerger skipped] Merge history of opt/net/ethernet am: e99dcfd4dd -s ours
am skip reason: Merged-In I770bf8db3f4c18467934eb2184f5dc2408fc28ec with SHA-1 f4905eb1d1 is already in history

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

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

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2022-03-31 12:32:26 +00:00
db004920b7
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
Merge changes from topic "ethernet-move-stage-aosp-master" into stage-aosp-master
* changes:
  Remove connectivity-tiramisu-updatable-sources
  Merge history of opt/net/ethernet

Patrick Rohr   authored and   Android (Google) Code Review   commited 2022-03-31 07:31:01 +00:00
da46118757
Remove connectivity-tiramisu-updatable-sources
The filegroup is now unnecessary as files are all in the service-t/src
directory.

This change allows building all sources including ethernet by
referencing src/**. This is done by using a general filegroup
service-connectivity-tiramisu-sources, so that branches that cannot
build the T+ code can change its contents without introducing merge
conflicts in the rest of the build rules.

Also change visibility rules to allow building the moved ethernet code,
and add a filegroup to allow building its tests.

Bug: 222234190
Test: TH
Merged-In: I770bf8db3f4c18467934eb2184f5dc2408fc28ec
Merged-In: I3e5df1bd44defbb9dd0c382c625a21e176368f2a
Change-Id: I8f23a45800b1086cc5a765fd24d734ca82c339a8

Remi NGUYEN VAN   commited 2022-03-31 15:14:39 +09:00
86bbfe9271