Commit graph

79,277 commits

Message SHA1
Merge "Add third_party/cpu_features to Cronet's copybara" into main
Treehugger Robot   authored and   Gerrit Code Review   commited 2023-09-12 17:48:34 +00:00
655d0850ac
Merge "Correct isLegacy metric data" into main
Paul Hu   authored and   Gerrit Code Review   commited 2023-09-12 08:41:10 +00:00
046b0c1c82
Merge changes If3217916,I86023b1f into main
* changes:
  Add java_defaults for @FlaggedApi handling
  Prepare api directory for udc mainline branch

Motomu Utsumi   authored and   Gerrit Code Review   commited 2023-09-12 08:25:42 +00:00
c6dc826c22
Merge "Add sim card requirement for CtsNativeNetDnsTestCases" into main
Mike Yu   authored and   Gerrit Code Review   commited 2023-09-12 07:59:36 +00:00
8c02f03949
Fix misc-unused-using-decls clang-tidy warning
packages/modules/Connectivity/service/native/TrafficController.cpp:58:18: error: using decl 'DumpWriter' is unused [misc-unused-using-decls,-warnings-as-errors]
using netdutils::DumpWriter;
^
packages/modules/Connectivity/service/native/TrafficController.cpp:58:18: note: remove the using
using netdutils::DumpWriter;
~~~~~~~~~~~~~~~~^~~~~~~~~~~
packages/modules/Connectivity/service/native/TrafficController.cpp:61:18: error: using decl 'ScopedIndent' is unused [misc-unused-using-decls,-warnings-as-errors]
using netdutils::ScopedIndent;
^
packages/modules/Connectivity/service/native/TrafficController.cpp:61:18: note: remove the using
using netdutils::ScopedIndent;
~~~~~~~~~~~~~~~~^~~~~~~~~~~~~

Test: presubmit
Change-Id: I1871139fed31c57a5c15a8ab4f88aa7c695ff360

Yi Kong   commited 2023-09-12 13:06:33 +09:00
a669de72d3
Correct isLegacy metric data
The isLegacy field of Nsd metrics should indicate whether the
data was collected from the old backend or not. However, it is
currently only dependent on the ENABLE_PLATFORM_MDNS_BACKEND
compat change value, which is incorrect. This is because the
NsdService always uses the new backend since Android U,
regardless of the compat change value. Therefore, the isLegacy
data should be obtained from each transaction.

Bug: 287546772
Bug: 299880473
Test: atest FrameworksNetTestCases NsdManagerTest
Change-Id: I156abd656b90578d710696a69ccf7dfca97a2c9c

Paul Hu   commited 2023-09-12 01:20:00 +00:00
508a012b2e
Implement Discovery PLATFORM logic in Rust
Add RemoteAuthConnectionCache and RemoteAuthPlatform
with support to sendMessage

Design doc: go/remote-auth-manager-fishfood-design

Test: built successfully.
Bug: : 291333048
Change-Id: I17f73b4fb2e22924a484eeb3baa9b933ae980076

Igor Zaslavsky   commited 2023-09-11 17:32:39 +00:00
3521a5ed8a
Merge changes I0afdda02,I1c47f616 into main
* changes:
  Implement ConnectivityStateMetrics sample
  Add base classes for common ConnectivityService tests.

Jean Chalard   authored and   Gerrit Code Review   commited 2023-09-11 11:32:06 +00:00
5f730c6ab5
Merge "[Thread] add ot-daemon to com.android.tethering" into main
Kangping Dong   authored and   Gerrit Code Review   commited 2023-09-11 11:20:49 +00:00
6b5205e587
Merge "Merge remote-tracking branch 'remotes/aosp/tmp_libs_net_move' into libs_net_move_merge" into main
Motomu Utsumi   authored and   Gerrit Code Review   commited 2023-09-11 10:06:56 +00:00
55850dccbf
Add sim card requirement for CtsNativeNetDnsTestCases
As connectivity pre-check was added to CtsNativeNetDnsTestCases
recently, this CL is needed as well.

Bug: 298886804
Test: TreeHugger
Change-Id: I3c26920e8609256470cd2b8c37fc1f33f56c39fd

Mike Yu   commited 2023-09-11 09:21:14 +00:00
a7d02ba66c
Implement ConnectivityStateMetrics sample
Test: ConnectivitySampleMetricsTest
Change-Id: I0afdda023208c3f8620cb5b89add66448af596d7

Chalard Jean   commited 2023-09-11 17:12:46 +09:00
f95e2de35a
Add base classes for common ConnectivityService tests.
This sets up what is necessary for an instrumented
ConnectivityService to run. Users of this class are
meant to inherit CSTest.

This is still relatively basic and does not have all the
instrumentation in ConnectivityServiceTest. Developers
looking to extend CSTest may find some instrumentation
missing ; when they add the missing instrumentation,
they should consider whether it should be generic for all
CSTests (and put it in base/), or whether it's local to
their own test suite. This should enable faster testing
as each CSTest children will only need to set up the
instrumentation it actually needs.

This patch also migrates a basic test to have a first user.

Bug: 272685721
Test: ConnectivityServiceTest
      CSBasicMethodsTest
Change-Id: I1c47f616af90629c9cb2a6ae89d992b19863e704

Chalard Jean   commited 2023-09-11 16:46:27 +09:00
0f5c4fe9cb
[Thread] add ot-daemon to com.android.tethering
ot-daemon is a dependency of the new Thread feature. This commit
add the ot-daemon binary and init rc file to the Tethering module.
Note that the ot-daemon service is default disabled and versioned
init rc file is used to ensure that this service won't be started
before Android U.

This is expected to increase the size of "com.android.tethering.capex"
by around 400 KB.

Manual verification:
1. on Android T (33) CF device, the ot-daemon service is not started
   after device boots; It reports service not found error when trying
   to start the ot-daemon service with adb shell command "start
   ot-daemon"
2. on Android U (34) CF device, the ot-daemon service is not started
   after device boots; It can be started with shell comamnd "start
   ot-daemon" but then failed because of missing sepolicy rules as
   expected

Test: see above manual verification note
Bug: 296211911
Change-Id: I222e2bbcc2ad0be2beec9f5f3406e7144d314370

Kangping Dong   commited 2023-09-11 14:46:19 +08:00
f2060610c0
Handle closed socket and NPE properly
Don't get interfaceIndex if the socket is closed. Properly catch NPE
instead of letting is propagating.

Test: TH
Change-Id: If962541e67dd6323426e46bc7a1f118786f83b9b

Yuyang Huang   commited 2023-09-11 13:10:05 +09:00
8f4adaedaf
Merge remote-tracking branch 'remotes/aosp/tmp_libs_net_move' into libs_net_move_merge
frameworks/libs/net/common ->
packages/modules/Connectivity/staticlibs

frameworks/libs/net/client-libs ->
packages/modules/Connectivity/staticlbs/client-libs

Test: TH
Bug: 296014682
Change-Id: I5dc78f0c4653e20312ab3d488b1e69262dbb9840

Motomu Utsumi   commited 2023-09-11 11:53:46 +09:00
c480039309
Merge common/ from platform/frameworks/libs/net/ to staticlibs/
Motomu Utsumi   commited 2023-09-11 11:27:49 +09:00
89e9fac536
Merge "Address review followup comments for NetworkStats" into main
Treehugger Robot   authored and   Gerrit Code Review   commited 2023-09-08 20:11:03 +00:00
8df4d76aa2
Merge "possibly fix clat ingress nat64 drop" into main
Maciej Żenczykowski   authored and   Gerrit Code Review   commited 2023-09-08 18:28:28 +00:00
cc677b3116
possibly fix clat ingress nat64 drop
Due to try_make_writable's implementation:

  // try to make the 1st 'len' header bytes r/w via DPA
  void try_make_writable(struct __sk_buff* skb, int len) {
    if (len > skb->len) len = skb->len;
    if (skb->data_end - skb->data < len) bpf_skb_pull_data(skb, len);
  }

This *should* normally result in nothing actually being done.

This is because the 'len' we request should trivially be <= skb->len
(by virtue of how we construct the packet / get here),
and because skb->data_end - skb->data < len was previously
(to this patch) already checked below in line 251
(and thus the packet would have been dropped if it was false).

However, there's a tentative theory that we could somehow end up
with the entire payload in the non-linear portion of the packet,
and thus need to move it into the linear header portion where
we actually have direct packet access to it.

Note also that we already called this in line 71, so it should
be safe to add another call without causing bpf verifier unhappiness...

Test: TreeHugger
Bug: 298879031
Signed-off-by: Maciej Żenczykowski <maze@google.com
Change-Id: If3531c3cf6932ac3f1d384a43d28326d17544aa3

Maciej Żenczykowski   commited 2023-09-08 18:20:21 +00:00
66da6a9b44
Merge "Increase the timeout waiting for the test app's network status." into main
Sudheer Shanka   authored and   Gerrit Code Review   commited 2023-09-08 17:40:45 +00:00
f58fd8442d
Fix sorting in copy.bara.sky
Test: none
Change-Id: I0506ec660fd88e39079b2f36aed1516e27cdc0a6

Patrick Rohr   commited 2023-09-08 07:11:56 -07:00
371b709921
Merge "Add Chicken bit for the mDNS offload feature" into main
Yuyang Huang   authored and   Gerrit Code Review   commited 2023-09-08 13:25:53 +00:00
169de9c8a1
Merge "Disable cache flush bit in existing announcement" into main
Paul Hu   authored and   Gerrit Code Review   commited 2023-09-08 12:48:05 +00:00
af511b5abe
Merge changes Id390c6c5,Iaa00d4d3,Iba6f410c into main
* changes:
  Add third_party/google_benchmark to cronet's copybara
  Move buildtools/third_party/libc++[abi] to third_party in Cronet's copybara
  Cronet Import: Add jni_zero to the list of third_parties

Treehugger Robot   authored and   Gerrit Code Review   commited 2023-09-08 11:06:37 +00:00
dad74776b8
Merge "Rename to isNetworkStackFeatureEnabled" into main
Motomu Utsumi   authored and   Gerrit Code Review   commited 2023-09-08 09:27:13 +00:00
daae5ca53d
Merge "Remove unnecessary arguments from isTetheringFeatureEnabled" into main
Motomu Utsumi   authored and   Gerrit Code Review   commited 2023-09-08 09:24:57 +00:00
656e42e16f
Merge "Remove unnecessary arguments from isTetheringFeatureEnabled" into main
Motomu Utsumi   authored and   Gerrit Code Review   commited 2023-09-08 09:24:57 +00:00
958ee15299
Add third_party/cpu_features to Cronet's copybara
See https://android-review.git.corp.google.com/c/platform/external/cronet/+/2719789/2 for more information.
Test: None

Change-Id: I3598857b2af5e09eee01ac3493135ec36b10e9b8

Mohannad Farrag   commited 2023-09-08 09:23:25 +00:00
1541d9fbd4
Add third_party/google_benchmark to cronet's copybara
Test: None
Change-Id: Id390c6c53f619b7bc87c80ae08acca9ee3a65c2e

Mohannad Farrag   commited 2023-09-08 09:23:25 +00:00
b16875a4d1
Move buildtools/third_party/libc++[abi] to third_party in Cronet's copybara
Test: None
Change-Id: Iaa00d4d383f84fbabe346cbe9a929ba471d68297

Mohannad Farrag   commited 2023-09-08 09:23:25 +00:00
c4daa59cd7
Cronet Import: Add jni_zero to the list of third_parties
Test: None
Change-Id: Iba6f410c23bdabbb5559772039b4242965e720a7

Mohannad Farrag   commited 2023-09-08 09:23:03 +00:00
eaba52172c
Add Chicken bit for the mDNS offload feature
Bug: 297482971
Test: TH
Change-Id: I6f2cdd066d9047b113ff80211cf6d4c6fa605104

Yuyang Huang   commited 2023-09-08 17:42:26 +09:00
b96a071f51
Merge "Add comments for framework-connectivity-t-mdns-standalone-build-sources" into main
Yuyang Huang   authored and   Gerrit Code Review   commited 2023-09-08 08:17:25 +00:00
29c616d76e
Remove unnecessary arguments from isTetheringFeatureEnabled
This CL also updates not to use isTetheringFeatureEnabled for
TETHER_FORCE_UPSTREAM_AUTOMATIC_VERSION which is wrongly configured in
Connectivity namespace.

Test: m
Bug: 279108992
Change-Id: If4f3a57c749bbaeb85454c31248c5bc5feaab936

Motomu Utsumi   commited 2023-09-08 16:11:28 +09:00
3e0be398a2
Increase the timeout waiting for the test app's network status.
Bug: 298729534
Test: atest com.android.cts.net.HostsideConnOnActivityStartTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:eaf030ea96f3af817e8b301c8edf48f79d7f229d)
Merged-In: I58a23e927cd14b973048e34566350eeef215f7db
Change-Id: I58a23e927cd14b973048e34566350eeef215f7db

Sudheer Shanka   authored and   Android Build Cherrypicker Worker   commited 2023-09-08 06:55:36 +00:00
0f53262c7b
Add comments for framework-connectivity-t-mdns-standalone-build-sources
framework-connectivity-t-mdns-standalone-build-sources should only be
used for building service-connectivity-mdns-standalone-build-test. Added
comment to prevent this filegroup being used in wrong way.

Test: TH
Change-Id: I11dd390967db1a115dcadcdebc20f226ab6c0a51

Yuyang Huang   commited 2023-09-08 14:51:08 +09:00
cf25a8a766
Add java_defaults for @FlaggedApi handling
This CL is a preparation to ignore @FlaggedApi API in udc mainline
branch

Bug: 299411828
Test: TH
Change-Id: If3217916b2c37ebaa7b48d8387c69cb078af9550

Motomu Utsumi   commited 2023-09-08 14:47:03 +09:00
310f11acfe
Prepare api directory for udc mainline branch
udc-extended-api directory will be used only in udc mainline branch to
hide @FlaggedApi annotated api which is not supported in that branch

Copied api directories from udc mainline branch.

Bug: 299411828
Test: TH
Change-Id: I86023b1fb3e5f9b4b787a564303e6d2e60f74467

Motomu Utsumi   commited 2023-09-08 11:42:21 +09:00
5dcd14569e
[nearby][clean up] Delete all Fast Pair AOSP and HalfSheetUX code
Test: -m
Fix: 292812342
Fix: 297413048
Fix: 214879640
Ignore-AOSP-First: merge conflicts, need to be merged in downstream first
Change-Id: I7efa92469f0c061a972a7dadf6a38686b78c61b4
Merged-In: I7efa92469f0c061a972a7dadf6a38686b78c61b4

Xinyi Zhou   commited 2023-09-07 16:03:09 -07:00
fcd2b7ccb0
Merge "fix a compile warning about out of order field init" into main
Maciej Żenczykowski   authored and   Gerrit Code Review   commited 2023-09-07 15:25:55 +00:00
05304f1437
Merge "Remove duplicated bpf offload support check in IpServer" into main
KH Shi   authored and   Gerrit Code Review   commited 2023-09-07 14:46:34 +00:00
966bb3e0d6
Verify that VPN name is set in VPN networks
Verify that the extra info for validation logs in the
NetworkInfo is set.

Bug: 297790570
Test: atest FrameworksNetTests
Change-Id: I5b77b3bab30154b7979cda003274cde0d834a5fb

Chiachang Wang   commited 2023-09-07 09:22:24 +00:00
5ee9dedb0f
Merge "Add IA Address option struct." into main
Xiao Ma   authored and   Gerrit Code Review   commited 2023-09-07 08:43:12 +00:00
e129bc5958
Merge "Remove the VisibleForTesting annotation on IaPrefixOption constructor." into main
Xiao Ma   authored and   Gerrit Code Review   commited 2023-09-07 08:18:23 +00:00
af996bec47
Merge "Invoke setDataEnabled instead of setDataEnabledForReason on R device" into main
Junyu Lai   authored and   Gerrit Code Review   commited 2023-09-07 01:36:58 +00:00
7145c5c1fe
fix a compile warning about out of order field init
http://cs/h/prodkernel/kernel/upstream/torvalds/linux-2.6/+/master:tools/include/uapi/linux/bpf.h?l=1486

struct { /* anonymous struct used by BPF_PROG_TEST_RUN command */
		__u32		prog_fd;
		__u32		retval;
		__u32		data_size_in;
		__u32		data_size_out;
		__aligned_u64	data_in;
		__aligned_u64	data_out;
...

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

Maciej Żenczykowski   commited 2023-09-06 23:51:37 +00:00
325f675273
remove TrafficController::dump
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I399ac8dfc4992f4c604f1d32c2f1b8ae06710808

Maciej Żenczykowski   commited 2023-09-06 16:50:06 +00:00
d70a33061e
Merge "cts: enforce cubic only on V+" into main
Maciej Żenczykowski   authored and   Gerrit Code Review   commited 2023-09-06 16:07:11 +00:00
4f28615724
Merge "Convert ProcNetTest to JUnit4." into main
Maciej Żenczykowski   authored and   Gerrit Code Review   commited 2023-09-06 16:06:18 +00:00
7d2678c424