Commit graph

92,974 commits

Message SHA1
Merge "[nearby] Add disable logic" into udc-mainline-prod
Xinyi Zhou   authored and   Android (Google) Code Review   commited 2023-11-14 19:22:20 +00:00
55d0559ccd
Merge "[Thread] add @RequiresPermissions for unregisterXxxCallback APIs" into main am: 5532b8884c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2825994

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

Kangping Dong   authored and   Automerger Merge Worker   commited 2023-11-14 06:58:48 +00:00
8801e55893
Merge "[Thread] resolve open comments for aosp/2737373" into main am: b46d21a898
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2822791

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

Kangping Dong   authored and   Automerger Merge Worker   commited 2023-11-14 06:58:36 +00:00
7ce79b7fe1
Merge "[Thread] add @RequiresPermissions for unregisterXxxCallback APIs" into main
Kangping Dong   authored and   Gerrit Code Review   commited 2023-11-14 06:29:41 +00:00
5532b8884c
Merge "[Thread] resolve open comments for aosp/2737373" into main
Kangping Dong   authored and   Gerrit Code Review   commited 2023-11-14 06:28:59 +00:00
b46d21a898
Merge changes Ia677f31a,I8d8f5752,Idc347bce into main am: 68219d1031
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2796003

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

Mike Yu   authored and   Automerger Merge Worker   commited 2023-11-14 05:54:43 +00:00
94ef169dd2
Merge changes Ia677f31a,I8d8f5752,Idc347bce into main
* changes:
  Add abstract getValue() for class SvcParam
  Use DnsPacket.toString() for DnsSvcbPacket
  Test: A minor fix for testDnsSvcbRecord_svcParamMandatory

Mike Yu   authored and   Gerrit Code Review   commited 2023-11-14 05:34:35 +00:00
68219d1031
Merge "implement InfraInterfaceController" into main am: 1c6a7a71dc
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2819297

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

Handa Wang   authored and   Automerger Merge Worker   commited 2023-11-14 04:48:21 +00:00
e496662e79
Merge "implement InfraInterfaceController" into main
Handa Wang   authored and   Gerrit Code Review   commited 2023-11-14 04:16:47 +00:00
1c6a7a71dc
Merge "Fix typedef retention" into main am: 4de53e2d18
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2824774

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

Anton Hansson   authored and   Automerger Merge Worker   commited 2023-11-13 10:11:00 +00:00
e4a6fd5bf7
Merge "Fix typedef retention" into main
Anton Hansson   authored and   Gerrit Code Review   commited 2023-11-13 09:39:05 +00:00
4de53e2d18
[Thread] add @RequiresPermissions for unregisterXxxCallback APIs
Per API council review suggestions in b/309952666, add the same
permission requirements for the unregister APIs.

Bug: 309952666
Test: atest CtsThreadNetworkTestCases
Change-Id: Idc481c7676ddc5d748fe7803f74dd63981186c09

Kangping Dong   commited 2023-11-13 17:29:07 +08:00
8e44412f7c
Merge changes from topics "RemoveFindIPv4", "RemoveLegacyVpnRunner" into main am: 8b61783b78
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2797273

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

Hansen Kurli   authored and   Automerger Merge Worker   commited 2023-11-13 06:03:19 +00:00
007b29987f
Merge changes from topics "RemoveFindIPv4", "RemoveLegacyVpnRunner" into main
* changes:
  Expect no error for startLegacyVpn with IPv6.
  Remove tests related to LegacyVpnRunner.

Hansen Kurli   authored and   Gerrit Code Review   commited 2023-11-13 05:27:07 +00:00
8b61783b78
Merge "[Test] CTS for DNS query fail-fast feature" into main am: a4e35a49b7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2815393

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

Ken Chen   authored and   Automerger Merge Worker   commited 2023-11-13 04:06:44 +00:00
efc321673f
Merge "[Test] CTS for DNS query fail-fast feature" into main
Ken Chen   authored and   Gerrit Code Review   commited 2023-11-13 03:23:40 +00:00
a4e35a49b7
Add abstract getValue() for class SvcParam
The return type of getValue() in each child class of SvcParam is
checked at compilation time.

Bug: 240259333
Test: atest ConnectivityCoverageTests
Change-Id: Ia677f31a32f40512793cf16a94f64da499594b1f

Mike Yu   commited 2023-11-13 02:52:23 +00:00
4f5930b1e7
Use DnsPacket.toString() for DnsSvcbPacket
All the important log message, such as SVCB records, can be printed
by DnsPacket.toString(), so there's no need to override toString()
in DnsSvcbPacket.

Bug: 240259333
Test: atest ConnectivityCoverageTests
Change-Id: I8d8f57524ce07d0177a39a9c3f87146d8eb51943

Mike Yu   commited 2023-11-13 02:52:23 +00:00
9f821e6b68
Test: A minor fix for testDnsSvcbRecord_svcParamMandatory
As per draft-ietf-dnsop-svcb-https-12.html#name-mandatory, the
values in SvcParamKey "mandatory" can appear in any order

Bug: 240259333
Test: atest ConnectivityCoverageTests
Change-Id: Idc347bcefd7a53323f2b380fba612926b2838e65

Mike Yu   commited 2023-11-13 02:52:23 +00:00
0b1574d863
[Test] CTS for DNS query fail-fast feature
For Power Saver tests, verify not only the network connectivity of
restricted apps, but also error cause.

Bug: 288340533
Test: atest
CtsHostsideNetworkTests: com.android.cts.net.HostsideNetworkCallbackTests
Change-Id: I122b62891175cd4a035f3c51c5b6073b34f8fd82

Ken Chen   commited 2023-11-11 11:19:35 +08:00
a10c53cc0d
[nearby] Add disable logic
Also moves enableBLE logic from init to when there is at least one
client

Test: -m
Bug: 294906731
Ignore-AOSP-First: nearby_not_in_aosp_yet
Change-Id: I24ca7581d60afee484d14f66a411344ce132425a

Xinyi Zhou   commited 2023-11-10 17:04:13 -08:00
3f5aea69f9
Merge "Update to fmtlib 10.1.1" into main am: c64eb2d816
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2817307

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

Henri Chataing   authored and   Automerger Merge Worker   commited 2023-11-10 19:01:39 +00:00
c45a255514
Merge "Update to fmtlib 10.1.1" into main
Henri Chataing   authored and   Gerrit Code Review   commited 2023-11-10 17:48:43 +00:00
c64eb2d816
Fix typedef retention
Typedef annotations are meant to have SOURCE retention, as they're
only analyzed by metalava to produce a separate file that's actually
consumed by the tools. Update typedefs as such.

Bug: 309971481
Test: m checkapi
Change-Id: Ic603db350af0825c87f4d99cff2ca4f4b7e57215

Anton Hansson   commited 2023-11-10 13:28:07 +00:00
f5fa3c6c72
implement InfraInterfaceController
InfraInterfaceController is used for creating an socket for
sending/receiving ICMPv6 ND messages on the infrastructure network
interface.

Bug: 299552948
Test: verified on a Cuttlefish

Change-Id: I02eafadafbf7a04e12fe74954b4812462c532e45

Handa Wang   authored and   Chalard Jean   commited 2023-11-10 21:11:01 +09:00
d295f8f146
Add equals, hashCode to MulticastRoutingConfig am: d25444ffce
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2801433

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

Yang Sun   authored and   Automerger Merge Worker   commited 2023-11-10 11:17:56 +00:00
49249f365e
Merge "Move 'isProbing' field from RecordInfo to ServiceRegistration" into main am: 9748f3b2f0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2819318

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

Yuyang Huang   authored and   Automerger Merge Worker   commited 2023-11-10 05:12:45 +00:00
619a075904
Add equals, hashCode to MulticastRoutingConfig
Add helper functions to help compare if MulticastRoutingConfig
has changed.

Test: atest MulticastRoutingConfigTest
Change-Id: I30ed4796efbaafbcf1a273c12a9231ec02bc36f0

Yang Sun   commited 2023-11-10 13:06:22 +08:00
d25444ffce
Merge "Move 'isProbing' field from RecordInfo to ServiceRegistration" into main
Yuyang Huang   authored and   Gerrit Code Review   commited 2023-11-10 04:38:01 +00:00
9748f3b2f0
Merge "Prepare exposing LocalNetworkConfig and its satellites" into main am: 8a5055a3e9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2778489

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

Jean Chalard   authored and   Automerger Merge Worker   commited 2023-11-10 03:35:09 +00:00
8a7868bc5a
Merge "Prepare exposing LocalNetworkConfig and its satellites" into main
Jean Chalard   authored and   Gerrit Code Review   commited 2023-11-10 03:08:07 +00:00
8a5055a3e9
Update to fmtlib 10.1.1
fmtlib 10+ removes the automatic formatting
of enum classes to the underlying class, requesting
that a custom formatter be provided for the type.

Normally fmt::underlying could be used to convert
the enum value to its backing type, but this change
automerges to udc-mainline-prod where the helper does
not exist.

Bug: 310046696
Test: m
Change-Id: I62f3a66dd2f8e3d288dc4c0298d4f3bfa57a6a71

Henri Chataing   commited 2023-11-10 01:53:03 +00:00
9007cca051
Merge "BpfRingBuf.h - implement isEmpty()" into main am: ca6cf094b9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2824859

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

Maciej Żenczykowski   authored and   Automerger Merge Worker   commited 2023-11-10 00:05:54 +00:00
81674db4cb
Merge "BpfRingBuf.h - implement isEmpty()" into main
Maciej Żenczykowski   authored and   Gerrit Code Review   commited 2023-11-09 23:20:01 +00:00
ca6cf094b9
BpfRingBuf.h - implement isEmpty()
Test: TreeHugger, atest BpfRingbufTest
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I23020869ab665c029c3219b1b39c3749be6e6992

Maciej Żenczykowski   commited 2023-11-09 19:13:40 +00:00
0b99c961bb
Merge "switch SynchronizeKernelRCU back to jni - but from BpfMap" into main am: 2a0a856c17
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2824390

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

Maciej Żenczykowski   authored and   Automerger Merge Worker   commited 2023-11-09 18:55:04 +00:00
af131772c7
Merge "switch SynchronizeKernelRCU back to jni - but from BpfMap" into main
Maciej Żenczykowski   authored and   Gerrit Code Review   commited 2023-11-09 17:40:53 +00:00
2a0a856c17
Merge "Add overriding method of a default method to signature files" into main am: be43ef41bc
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2824410

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

Jihoon Kang   authored and   Automerger Merge Worker   commited 2023-11-09 17:39:31 +00:00
563a7383bf
Merge "Add overriding method of a default method to signature files" into main
Jihoon Kang   authored and   Gerrit Code Review   commited 2023-11-09 17:00:53 +00:00
be43ef41bc
[automerger skipped] Merge "Add NSD_LIMIT_LABEL_COUNT flag" into main am: a96c86d34a -s ours
am skip reason: Merged-In I48b1dc26f41549ec4afc71f87e98a02ac773430f with SHA-1 8813f74f52 is already in history

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

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

Paul Hu   authored and   Automerger Merge Worker   commited 2023-11-09 15:02:05 +00:00
c1ceb3b520
[automerger skipped] Add NSD_LIMIT_LABEL_COUNT flag am: fd357ef695 -s ours
am skip reason: Merged-In I48b1dc26f41549ec4afc71f87e98a02ac773430f with SHA-1 8813f74f52 is already in history

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

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

Paul Hu   authored and   Automerger Merge Worker   commited 2023-11-09 15:02:02 +00:00
1a35b823f1
Merge "Add NSD_LIMIT_LABEL_COUNT flag" into main
Paul Hu   authored and   Gerrit Code Review   commited 2023-11-09 14:09:29 +00:00
a96c86d34a
switch SynchronizeKernelRCU back to jni - but from BpfMap
we can't use java for this, because pre-U-QPR2 does not include:
  https://android-review.googlesource.com/c/platform/system/sepolicy/+/2821590
  system_server dontaudit key_socket getopt

so we'll spew lots of:
  11-08 07:52:43.776 1469 1469 I auditd : type=1400 audit(0.0:4): avc: denied { getopt } for comm="system_server" scontext=u:r:system_server:s0 tcontext=u:r:system_server:s0 tclass=key_socket permissive=0
  11-08 07:52:44.360 1469 1469 I auditd : type=1400 audit(0.0:5): avc: denied { getopt } for comm="NetworkStats" scontext=u:r:system_server:s0 tcontext=u:r:system_server:s0 tclass=key_socket permissive=0
  11-08 07:52:44.508 1469 1469 I auditd : type=1400 audit(0.0:7): avc: denied { getopt } for comm="android.bg" scontext=u:r:system_server:s0 tcontext=u:r:system_server:s0 tclass=key_socket permissive=0
and the like.

This is due to Java's Os.close() in:
  libcore/luni/src/main/java/libcore/io/BlockGuardOs.java;l=100
calling:
  if (fd.isSocket$()) if (isLingerSocket(fd)) ...

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ib87fa5e8f0dfd9fbbccb25fb58a9fa78d6a07111

Maciej Żenczykowski   commited 2023-11-09 11:08:58 +00:00
c350db788a
Merge "Baseline issues that were previously suppressed" into main am: 879946d1c9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2818860

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

Anton Hansson   authored and   Automerger Merge Worker   commited 2023-11-09 10:26:52 +00:00
93ea8465b5
Merge "Baseline issues that were previously suppressed" into main
Anton Hansson   authored and   Gerrit Code Review   commited 2023-11-09 10:03:23 +00:00
879946d1c9
[Thread] resolve open comments for aosp/2737373
Change-Id: Id2c58d8bf72139f10036b5488a12f45dd0c7c2db

Kangping Dong   commited 2023-11-09 17:48:34 +08:00
c959d665ab
Merge "[Thread] add ThreadNetworkUnitTests to postsubmit" into main am: 474abf134e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2819757

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

Kangping Dong   authored and   Automerger Merge Worker   commited 2023-11-09 09:47:15 +00:00
8f76c9f889
Add overriding method of a default method to signature files
Currently, the signature file elides overrides of a default method,
as they are not essential for the compilation of the stubs.
However, in some scenarios, the overrides of a default method may be
essential for the compilation of the reverse dependency of the stubs.
In the scenario seen below:
```
// API
interface ApiInterface {
    public default void bar() {};
}
class ApiClass implements AnotherParentInterface{
    public void bar() {}
}

// App depending on the API
interface AppInterface {
    public void bar();
}
public class AppClass extends ApiClass implements AppInterface {
}
```
Removal of `ApiClass.bar()` will lead to not overriding an abstract method
`AppInterface.bar()` compilation error in `AppClass`.
Therefore, this change adds the overrides of a default method to the
signature files.

Test: checkapi
Bug: 299366704
Change-Id: Ie11dbeafc39efec06f605e306c92155e834a6685

Jihoon Kang   commited 2023-11-09 09:40:27 +00:00
9c5c9b0a94
Merge "[Thread] add ThreadNetworkUnitTests to postsubmit" into main
Kangping Dong   authored and   Gerrit Code Review   commited 2023-11-09 09:23:12 +00:00
474abf134e
Move 'isProbing' field from RecordInfo to ServiceRegistration
Move the 'isProbing' field from RecordInfo to ServiceRegistration class.
The 'isProbing' state is tightly coupled to each registration, rather
than each record. This refactor simplifies the RecordInfo class, which
is necessary for future updates to support updating RecordInfo in place.

Bug: 300560526
Test: TH
Change-Id: Ic7a5514fe5ce3262896ef34a6b629780da022f30

Yuyang Huang   commited 2023-11-09 15:49:34 +09:00
d1f779d88f