Commit Graph

92672 Commits

Author SHA1 Message Date
Maciej Żenczykowski
dbf8d3025e Merge "remove dead portions of BpfUtils.java" into main am: bee431759a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2803204

Change-Id: Ib920e77884fb0d1d88d45c93a84cbd19b7244484
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 23:21:24 +00:00
Maciej Żenczykowski
bee431759a Merge "remove dead portions of BpfUtils.java" into main 2023-10-25 22:53:49 +00:00
Xinyi Zhou
ec96e74b3d Merge "[nearby] Enable BLE when init" into udc-mainline-prod 2023-10-25 22:47:53 +00:00
Maciej Żenczykowski
17e132dd71 Merge "netbpfload: prep work to support <U" into main am: 906cac004f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2803009

Change-Id: I771c53099f9845104073efa5503a437225c98f78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 21:33:32 +00:00
Maciej Żenczykowski
906cac004f Merge "netbpfload: prep work to support <U" into main 2023-10-25 21:14:08 +00:00
Maciej Żenczykowski
f33f12876f netbpfload: prep work to support <U
proc file writes were only moved from .rc into bpfloader binary in U.

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I20eda71d4f4e16130401d1cfff239c7cd8ea9bf6
2023-10-25 18:40:53 +00:00
Maciej Żenczykowski
de9d367ab2 remove dead portions of BpfUtils.java
(mostly to improve code coverage)

We can always revert if it ever turns out this is useful,
but I'd prefer for cgroup attach to be a once-at-boot
thing and handled either from bpfloader or the netd updatable
which are both directly C++ code.

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I79b5ca8a47388cb6b9189234942e74ab6056aab9
2023-10-25 17:40:35 +00:00
Kangping Dong
f96201be45 Merge "[Thread] add Thread Operational Dataset API" into main am: 898ed69359
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2733453

Change-Id: I1dceffe4b1bc0339ee2f6c2b348a740c1813d447
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 12:48:29 +00:00
Kangping Dong
898ed69359 Merge "[Thread] add Thread Operational Dataset API" into main 2023-10-25 12:24:16 +00:00
Kangping Dong
7fea5fa6a2 [Thread] add Thread Operational Dataset API
Design doc: go/thread-android-api
Android FR: b/235016403

Bug: 262683651
Change-Id: Icbd4ee4150e3fd78df627c2e726c259e7ee50871
2023-10-25 18:13:07 +08:00
Jean Chalard
5b0ebeabeb Merge "Add a routing coordinator class" into main am: 4e47533688
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2729133

Change-Id: Ibadbe0c4cf62a148d7051a162bfd86a3b047252e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 09:46:03 +00:00
Jean Chalard
4e47533688 Merge "Add a routing coordinator class" into main 2023-10-25 09:13:16 +00:00
Mark Chien
2af81f2a13 Merge "Fix testRequestDownstreamAddressWithoutUsingLastAddress flaky" into main am: cc26d678f2
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2787876

Change-Id: Icb4a6912efa4d5ce737f9f0503228b7b690c98ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 04:10:42 +00:00
Mark Chien
cc26d678f2 Merge "Fix testRequestDownstreamAddressWithoutUsingLastAddress flaky" into main 2023-10-25 03:41:10 +00:00
Patrick Rohr
239b1a6040 Merge changes Idce2024f,I7e009073,I29fe506c,I37b2a0b8,Iccb4e3ec into main am: 49967eab24
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2802475

Change-Id: I6ef629cc6be379ffc1bd22899ed5c5cee67d0059
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 02:28:53 +00:00
Junyu Lai
bfd5e9d274 Merge "Revert "Revert "[BR07.1] Expose setDataSaverEnabled from Connect..."" into main am: 0cfaea8d98
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2801074

Change-Id: Idf9003f52a119033cd76cde87b6becf70fa03f15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 02:28:36 +00:00
Patrick Rohr
49967eab24 Merge changes Idce2024f,I7e009073,I29fe506c,I37b2a0b8,Iccb4e3ec into main
* changes:
  Add toString for more consistent logging to IaPrefixOption
  Create IpPrefix in IaPrefixOption constructor
  Add @Computed annotation to Struct
  Remove check that preferred lifetime >= t2
  Remove IA prefix option option-code from public constructor
2023-10-25 02:14:30 +00:00
Junyu Lai
0cfaea8d98 Merge "Revert "Revert "[BR07.1] Expose setDataSaverEnabled from Connect..."" into main 2023-10-25 01:59:12 +00:00
Maciej Żenczykowski
2455a7ee41 Merge "move bpfloader.rc into p/m/C" into main am: 4530eaaa9e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2799940

Change-Id: I553d49396f00b27bf3f4b6779765469dc573a17d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 00:20:53 +00:00
Maciej Żenczykowski
4530eaaa9e Merge "move bpfloader.rc into p/m/C" into main 2023-10-25 00:07:02 +00:00
Xinyi Zhou
2a9323b184 [nearby] Enable BLE when init
Fix: 294906731
Test: -m
Ignore-AOSP-First: nearby_not_in_aosp_yet
Change-Id: Ie380efbc452af51691daa1e96e04dd575801c3a9
2023-10-24 16:47:48 -07:00
Patrick Rohr
8f77f016df Add toString for more consistent logging to IaPrefixOption
toString() approximately follows the format of tcpdump logging ND
options.

Test: TH
Change-Id: Idce2024f44bba5427dc0f88128b87b367c09ccb6
2023-10-24 15:07:14 -07:00
Patrick Rohr
9f03f9e6e5 Create IpPrefix in IaPrefixOption constructor
The constructor is invoked during Struct#parse() at which point we might
as well try to create the IpPrefix object which will be used later. If
this fails for some reason (UnknownHostException or ClassCastException),
the prefix is bogus and should not be used.

Test: TH
Change-Id: I7e0090735022d017ba11aa85266ba19e65807da7
2023-10-24 15:04:19 -07:00
Patrick Rohr
3b2c559149 Add @Computed annotation to Struct
@Computed will ignore "computed" fields from struct parsing. Fields
cannot both be annotated by @Computed and @Field (though there
currently is no check for this).

Test: builds
Change-Id: I29fe506c5e3be4cc50fdaf3a07fc5e922111165b
2023-10-24 15:03:35 -07:00
Maciej Żenczykowski
ef5b6af0b1 doc: add bpfloader rc files from previous Android releases am: b0940279c4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2799941

Change-Id: I981403ea7448a9c92bb1a94bf623c3231052856c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-24 21:47:39 +00:00
Maciej Żenczykowski
b0940279c4 doc: add bpfloader rc files from previous Android releases
Stripping comments since those are not interesting
for the purposes of what these things actually do.

Doing R+ since tethering apex only supports R+ now.

Generated via:
  (cd ../../../../../system/bpf && git cat-file -p remotes/aosp/android11-release:bpfloader/bpfloader.rc; ) | egrep -v '^ *#' > bpfloader-sdk30-11-R.rc
  (cd ../../../../../system/bpf && git cat-file -p remotes/aosp/android12-release:bpfloader/bpfloader.rc; ) | egrep -v '^ *#' > bpfloader-sdk31-12-S.rc
  (cd ../../../../../system/bpf && git cat-file -p remotes/aosp/android13-release:bpfloader/bpfloader.rc; ) | egrep -v '^ *#' > bpfloader-sdk33-13-T.rc
  (cd ../../../../../system/bpf && git cat-file -p remotes/aosp/android14-release:bpfloader/bpfloader.rc; ) | egrep -v '^ *#' > bpfloader-sdk34-14-U.rc
  (cd ../../../../../system/bpf && git cat-file -p remotes/aosp/main:bpfloader/bpfloader.rc;              ) | egrep -v '^ *#' > bpfloader-sdk34-14-U-QPR2.rc

Test: N/A
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Idd8032ce66ef07a1d9e42343e75b26d764e6d8c1
2023-10-24 19:26:55 +00:00
Patrick Rohr
dc6c70fd5f Remove check that preferred lifetime >= t2
For a single address, DHCPv6 won't work well (i.e. potentially lose provisioning) if
the preferred lifetime is lower than t2. However, this might be a valid
scenario in a renumbering event in the presence of multiple prefixes.

Additionally, in DHCPv6 it is up to the server to configure the client
correctly.

Test: TH
Change-Id: I37b2a0b89deda85b3f7be29c8f02f685aa6e65f8
2023-10-24 11:44:46 -07:00
Xinyi Zhou
4c795363e0 Merge "[nearby] Add logs to broadcaster" into udc-mainline-prod 2023-10-24 18:08:38 +00:00
Kangping Dong
24e5b1bee6 Merge "[Thread] flagging Android Thread APIs" into main am: 9513988323
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2799715

Change-Id: I284b45cf12adbd876ca42ba3d608db31b172c907
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-24 14:58:13 +00:00
Kangping Dong
9513988323 Merge "[Thread] flagging Android Thread APIs" into main 2023-10-24 14:26:06 +00:00
Chalard Jean
2fb66f1b28 Add a routing coordinator class
Test: In followup changes : RoutingCoordinatorManagerTest
Change-Id: Ia6811d614e02123a072c7638291828745abae051
2023-10-24 22:12:26 +09:00
Kangping Dong
75aa485604 [Thread] flagging Android Thread APIs
This commit declares the initial "thread_enabled" feature flag and use
this to flag all existing and future Thread system APIs with @FlaggedApi

Bug: 301473012
Test: build
Change-Id: I43f64ce38f7fd0806733b21c4f393e4563e6a467
2023-10-24 19:45:04 +08:00
Maciej Żenczykowski
7da54d9940 move bpfloader.rc into p/m/C
Generated via:
  cat ../../../system/bpf/bpfloader/bpfloader.rc > netbpfload/netbpfload.rc

(plus changing Android.bp to use it)

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I4bcdd57b0b5abcc296a4c56273d6aac632560345
2023-10-24 02:18:02 -07:00
Junyu Lai
df210365fe Revert "Revert "[BR07.1] Expose setDataSaverEnabled from Connect..."
Revert submission 2799494-revert-2745215-npmsbpf-OBOPDXREUI

Reason for revert: Need to 1. Merge API first. 2. Wait for prebuilt. 3. Merge the caller.

Reverted changes: /q/submissionid:2799494-revert-2745215-npmsbpf-OBOPDXREUI

Change-Id: Icd5f3d40595a0d2a221b016cec70568bf3597c16
2023-10-24 07:30:23 +00:00
Mark Chien
b7fdac5553 Merge changes I427360f6,Ie6dbbe22 into main am: 66ef9d35ce
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2749783

Change-Id: I12f4e2ea6c8a8342cf22c8a5f2f6006700c7a806
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-24 07:09:30 +00:00
Mark Chien
66ef9d35ce Merge changes I427360f6,Ie6dbbe22 into main
* changes:
  SyncSM05.1: add testMultiDepthTransition
  SyncSM05: add SyncStateMachineTest
2023-10-24 06:50:43 +00:00
Junyu Lai
8f1730ebf9 Merge "[BR01.1] Support BpfNetMapsReader" into main am: a62eed380c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2725213

Change-Id: I0a9955e7fa9d51b423f8cd1113553dd492caf843
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-24 06:19:04 +00:00
Mark Chien
239860a4d6 Fix testRequestDownstreamAddressWithoutUsingLastAddress flaky
The problem is that the test releases mHotspotIpServer’s prefix before testing mUsbIpServer, which means that mUsbIpServer might choose the same address as mHotspotIpServer’s.

To fix this, we need to test that mUsbIpServer and mHotspotIpServer have different addresses before calling releaseDownstream(mHotspotIpServer).

Change-Id: Id7f7bbfeda841ec9b97e24c0f11893fa37b9ef54
Test: TH
Bug: 300127195
2023-10-24 06:16:03 +00:00
Junyu Lai
a62eed380c Merge "[BR01.1] Support BpfNetMapsReader" into main 2023-10-24 05:56:33 +00:00
Jean Chalard
3f57c071d1 Merge "Fix arg order to set-package-network-enabled in the CTS preparer" into main am: e7662ae724
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2799134

Change-Id: I990e4a9df35b3c5c380349a7212b9fc87524c845
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-24 05:54:38 +00:00
Jean Chalard
e7662ae724 Merge "Fix arg order to set-package-network-enabled in the CTS preparer" into main 2023-10-24 05:39:55 +00:00
Hansen Kurli
d59d1d790a Merge "Mock Vpn.setAlwaysOnPackage()." into main am: a584159ceb
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2760608

Change-Id: I248a5f17f01a06e79159985881141fe2f767d83a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-24 03:30:24 +00:00
Hansen Kurli
a584159ceb Merge "Mock Vpn.setAlwaysOnPackage()." into main 2023-10-24 03:11:38 +00:00
Xinyi Zhou
85f260c4dd [nearby] Add logs to broadcaster
Test: -m
Ignore-AOSP-First: nearby_not_in_aosp_yet
Change-Id: I9fd0009d21ac5193a2e7b715067c4956902cd2db
2023-10-24 01:05:31 +00:00
Patrick Rohr
b8af9d5c19 Remove IA prefix option option-code from public constructor
Since it is constant. Struct.parse() still requires a constructor that
includes the code field, so it is marked protected.

Test: TH
Change-Id: Iccb4e3ec4078e0dcc73836f0d1b721146153da50
2023-10-23 14:28:19 -07:00
Maciej Żenczykowski
a588136a62 Merge "Add test for cgroup bpf program status" into main am: 1bd33c6c17
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2797481

Change-Id: I8684d1beae7095a6fbd2e2a79ffed058c81e2f27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-23 18:48:09 +00:00
Maciej Żenczykowski
1bd33c6c17 Merge "Add test for cgroup bpf program status" into main 2023-10-23 18:37:05 +00:00
Jordan Silva
842bdb6564 Merge "Revert "[BR07.1] Expose setDataSaverEnabled from ConnectivityManager"" into main am: 118c2646f3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2799494

Change-Id: Ifcb1c1db20028880aaa192db5827d98253f8c7c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-23 15:34:59 +00:00
Jordan Silva
118c2646f3 Merge "Revert "[BR07.1] Expose setDataSaverEnabled from ConnectivityManager"" into main 2023-10-23 15:12:50 +00:00
Jordan Silva
457ae0f00f Revert "[BR07.1] Expose setDataSaverEnabled from ConnectivityManager"
Revert submission 2745215-npmsbpf

DroidMonitor: Potential culprit for Bug 307256512 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.


Reason for revert: 307256512

Reverted changes: /q/submissionid:2745215-npmsbpf

Change-Id: I27119a7484453d1369bbdf71ad2479edec7d664f
2023-10-23 13:23:01 +00:00