Commit Graph

71599 Commits

Author SHA1 Message Date
Paul Hu
039d8111e0 Send MdnsServiceInfo on onServiceRemoved callback
Send MdnsServiceInfo on onServiceRemoved callback which include
service name, service type and other info instead of service name
only. These extra info is necessary for service lost callback on
NsdService on the following changes.

Bug: 254166302
Test: atest FrameworksNetTests
Change-Id: Ibacbef4b893209bbc2a37376bf26d713ce41429c
2022-11-29 11:51:16 +08:00
Mohannad Farrag
df1fb9ef18 gn2bp: Convert genrules to cc_genrules am: 1de6cb10d3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2318815

Change-Id: Icb1d98df122ce010d47bb4c616543f765ff99cf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-28 23:08:50 +00:00
Mohannad Farrag
1de6cb10d3 gn2bp: Convert genrules to cc_genrules
* This change doesn't effectively use the `CC_ARCH` environment variable. Just a change of variable name.
* cc_genrules are compiled so they need host_supported/device_supported tags.

Test: m cronet_aml_components_cronet_android_cronet
Change-Id: Ie55e5e0fb60b444817bc13c967e89f35c4e8badf
2022-11-28 17:18:22 +00:00
Chidera Olibie
d4404ad741 Merge "cronet: change the test dirname to standard cronet/tests/cts format" am: afedfb18dd
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2312166

Change-Id: I03450dbcd7b2d0e763b25ab6c93f712864d8e8ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-28 15:27:31 +00:00
Chidera Olibie
afedfb18dd Merge "cronet: change the test dirname to standard cronet/tests/cts format" 2022-11-28 14:43:59 +00:00
Motomu Utsumi
644e723900 gn2bp: Support MTE in arm64 to fix build error am: 3371d685f7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2319217

Change-Id: I6405bbddf32ad471835009e8afc980b16507634d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-28 11:24:17 +00:00
Motomu Utsumi
c023bce6dd gn2bp: Make update_results parse desc_arm64.json am: 8b291dc401
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2319216

Change-Id: Idbb56a2a93fae6cb2754b880bfac2a85bd183332
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-28 11:24:16 +00:00
Motomu Utsumi
bcd0d40b96 gn2bp: Make update_results parse desc_arm.json am: 5684cfd976
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2319215

Change-Id: Ifd6bafffb3ae89e729b46de132ce7240b903e660
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-28 11:24:14 +00:00
Motomu Utsumi
3371d685f7 gn2bp: Support MTE in arm64 to fix build error
Test: lunch aosp_arm64 && m cronet_aml_components_cronet_android_cronet
Change-Id: I73b92b96175689f649e0bba04db0fbb1f38d0c5e
2022-11-28 16:56:52 +09:00
Motomu Utsumi
8b291dc401 gn2bp: Make update_results parse desc_arm64.json
lunch aosp_arm64 && m cronet_aml_components_cronet_android_cronet is
failing. Will be fixed by upcoming CL.

Test: lunch aosp_arm && m cronet_aml_components_cronet_android_cronet
Test: lunch aosp_cf_x86_phone && m cronet_aml_components_cronet_android_cronet
Test: lunch aosp_cf_x86_64_phone && m cronet_aml_components_cronet_android_cronet
Change-Id: Ibaf4720eaca21d530a31d83ba0173bbc7c9bf302
2022-11-28 12:32:16 +09:00
Mohannad Farrag
252639e672 gn2bp: Convert source_set to cc_object am: 7f29d836a7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2314944

Change-Id: I46981a899ac7558d036cde98efa68b21a3f2626b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-28 03:23:58 +00:00
Remi NGUYEN VAN
529e13cb39 Add MdnsPacketRepeater
MdnsPacketRepeater is a base class to send packets at various intervals.

It will be used to implement probing or advertising, which involves
sending a packet multiple times.

Bug: 241738458
Test: atest MdnsAnnouncerTest (with MdnsAnnouncer change)
Change-Id: I4febbc3eb5472701cb7999b6dba6259246ff46ee
2022-11-28 12:15:52 +09:00
Motomu Utsumi
5684cfd976 gn2bp: Make update_results parse desc_arm.json
Test: lunch aosp_arm && m cronet_aml_components_cronet_android_cronet
Test: lunch aosp_cf_x86_phone && m cronet_aml_components_cronet_android_cronet
Test: lunch aosp_cf_x86_64_phone && m cronet_aml_components_cronet_android_cronet
Change-Id: I6dc2345c66d784a52c7389c823c06962fa0e74d6
2022-11-28 12:14:51 +09:00
Mohannad Farrag
7f29d836a7 gn2bp: Convert source_set to cc_object
* Convert every source_set into a cc_object.

Test: m cronet_aml_components_cronet_android_cronet
Change-Id: Iaa123d1b348e8809fbfa4acc1d888bb6d0d0989c
2022-11-25 13:54:05 +00:00
Mohannad Farrag
77f80f7f1e Merge changes I2407997f,I9386bd66,I6912df70,Iad2ab990,I5786a1ab, ... am: d7e03f2ddf
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2318201

Change-Id: I900113f6f34d9b7848db8f5744d1c3dae869f640
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-25 11:42:54 +00:00
Mohannad Farrag
d7e03f2ddf Merge changes I2407997f,I9386bd66,I6912df70,Iad2ab990,I5786a1ab, ...
* changes:
  gn2bp: Remove code for gen_version_module
  gn2bp: Remove code for proto_descriptor_module
  gn2bp: Remove code for gen_amalgamated_sql_metrics
  gn2bp: Remove TARGET in update_results.sh
  gn2bp: Remove unnecessary conversion for write_native_libraries_java.py
  gn2bp: Remove crbug_908819 related conversion
  gn2bp: Remove unnecessary conversion for grit action
  gn2bp: Remove unnecessary hack for build_config_gen
2022-11-25 11:17:59 +00:00
Motomu Utsumi
7f765cf69a gn2bp: Remove code for gen_version_module
Which is not used in cronet
Test: ./update_results.sh

Change-Id: I2407997f51b6e89e960144c56d504fcf772d26ee
2022-11-25 19:00:25 +09:00
Motomu Utsumi
ed27df7d5a gn2bp: Remove code for proto_descriptor_module
Which is not used for cronet
Test: ./update_results.sh

Change-Id: I9386bd6617fbe1d1bf4d175ed9958e70f9936c68
2022-11-25 19:00:25 +09:00
Motomu Utsumi
9206dd9dea gn2bp: Remove code for gen_amalgamated_sql_metrics
Test: ./update_results.sh
Change-Id: I6912df70effd578feb1bf70f8bbd3a6240c20b20
2022-11-25 19:00:25 +09:00
Motomu Utsumi
abbfdc3aa6 gn2bp: Remove TARGET in update_results.sh
Use default_targets in gen_android_bp instead

Test: ./update_results.sh
Change-Id: Iad2ab99078857f0e0c851a0958c2c1d73c18cb0e
2022-11-25 19:00:25 +09:00
Motomu Utsumi
8d5e07e030 gn2bp: Remove unnecessary conversion for write_native_libraries_java.py
Test: ./update_results.sh
Change-Id: I5786a1ab2d10373eb07e71efd6f2f29e7fc9ba8d
2022-11-25 19:00:25 +09:00
Motomu Utsumi
104d6e431a gn2bp: Remove crbug_908819 related conversion
Which is not required anymore

Test: ./update_results.sh
Change-Id: Ic9b8fa1b15defa5d333662787bbdd7f4db5cdca5
2022-11-25 19:00:16 +09:00
Motomu Utsumi
4b35a32fb9 gn2bp: Remove unnecessary conversion for grit action
Test: ./update_results.sh
Change-Id: I0c853a3bfb3c8182aef8dabbb2f2d599f8dc3d61
2022-11-25 18:59:12 +09:00
Motomu Utsumi
37bedfa3cb gn2bp: Remove unnecessary hack for build_config_gen
This is not required anymore.

Test: ./update_results.sh
Change-Id: I5cc9d1dffa5f9733870fa22debf79278adb1f301
2022-11-25 18:57:48 +09:00
Frank Li
55f79d43b0 Revert "Remove the stats protos from ConnectivityService until tests are added"
This reverts commit ec8c31d3f5.

Reason for revert: Test coverage excludes ConnectivityService metrics and classes via cl/489997332

Change-Id: Ia96f030af983cc2b42ddd82371679d1ccaadd743
2022-11-25 06:08:10 +00:00
Motomu Utsumi
9ebef1917c Merge "gn2bp: Add _is_java_source method" am: f9fa2bb224
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2317453

Change-Id: I81349a554683b536223ac28a5b6aa2d292965e69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-25 02:43:07 +00:00
Motomu Utsumi
f9fa2bb224 Merge "gn2bp: Add _is_java_source method" 2022-11-25 02:17:23 +00:00
Mark Chien
0affc39da5 Merge "Remove dead code: updateUpstreamIPv6LinkProperties in InitialState" am: 6ed83a43c8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2314140

Change-Id: I9d06a279ae8ce5ea568e53d15cc17f30f07ed358
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-25 01:42:45 +00:00
Mark Chien
6ed83a43c8 Merge "Remove dead code: updateUpstreamIPv6LinkProperties in InitialState" 2022-11-25 01:07:15 +00:00
Maciej Żenczykowski
5796af3535 Merge "bpf clatd.c - refix RFC6145 - really use low 16 bits of IPv6 frag id" am: 5cee8817af
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2310646

Change-Id: Ide235f930bc22b3a6592d085ad19ca544126b9cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-24 15:41:39 +00:00
Maciej Żenczykowski
5cee8817af Merge "bpf clatd.c - refix RFC6145 - really use low 16 bits of IPv6 frag id" 2022-11-24 15:25:59 +00:00
Hassan Ali
70bc5bc6d8 Merge "Add ConfigInfrastructure lib to Android.bp" am: bfb0cdfa51
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2305844

Change-Id: Icc8743e4de6bace50727fcb8544e8f774a2a983c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-24 14:12:22 +00:00
Hassan Ali
bfb0cdfa51 Merge "Add ConfigInfrastructure lib to Android.bp" 2022-11-24 13:33:28 +00:00
Mohannad Farrag
f7371d704c Merge "gn2bp: Remove unnecessary hack" am: 8bc24741d0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2316966

Change-Id: I2e0d923b396faf135e205a7cdb024a7505143f3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-24 13:12:31 +00:00
Mohannad Farrag
8bc24741d0 Merge "gn2bp: Remove unnecessary hack" 2022-11-24 12:30:57 +00:00
Mohannad Farrag
a0db68bc8d gn2bp: Add _is_java_source method
Test: m cronet_aml_components_cronet_android_cronet
Change-Id: I2c28c794ba2b39e2a3baec0cce83a5e1d7770381
2022-11-24 12:28:09 +00:00
Maciej Żenczykowski
f7d2393ded bpf clatd.c - refix RFC6145 - really use low 16 bits of IPv6 frag id
To quote: https://www.rfc-editor.org/rfc/rfc6145

4.1 Identification:
The low-order 16 bits copied from the Identification field in
the IPv4 header.  The high-order 16 bits set to zero.

5.1.1 Identification:
Copied from the low-order 16 bits in the Identification field in
the Fragment Header.

The RFC does not mention endianness.  But I'm assuming it thinks
of things as network, ie. big, endian.

This matches userspace external/android-clat/translate.c:214

  ip_targ->id       = htons(ntohl(frag_hdr->ip6f_ident) & 0xffff);

This takes the 3rd and 4th byte of the 32-bit ipv6 frag ident field:

see also line 195:

  frag_hdr->ip6f_ident = htonl(ntohs(old_header->id));

and

packages/modules/Connectivity/bpf_progs/bpf_net_helpers.h

// Android only supports little endian architectures
#define htons(x) (__builtin_constant_p(x) ? ___constant_swab16(x) : __builtin_bswap16(x))
#define htonl(x) (__builtin_constant_p(x) ? ___constant_swab32(x) : __builtin_bswap32(x))
#define ntohs(x) htons(x)
#define ntohl(x) htonl(x)


Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ie4eed30cfd0e3e3e4dfa6c1a54751dcae1f9972b
2022-11-24 09:15:57 +00:00
Remi NGUYEN VAN
337db1e54c Merge "Use a random service type for NsdManagerTest" am: 6b62604bee
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2301564

Change-Id: I0c9b225ade554f24bd31c90dc94b6828e95ebc86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-24 06:12:14 +00:00
Remi NGUYEN VAN
088dfa5b0d Merge "Use a longer timeout for service registration" am: ef81865662
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2300545

Change-Id: I4b67f63721e1de8f861a5d9482e7f3f399047711
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-24 06:11:39 +00:00
Remi NGUYEN VAN
6b62604bee Merge "Use a random service type for NsdManagerTest" 2022-11-24 05:37:22 +00:00
Remi NGUYEN VAN
ef81865662 Merge "Use a longer timeout for service registration" 2022-11-24 05:36:55 +00:00
Motomu Utsumi
3e9173087b gn2bp: Remove unnecessary hack
Now the gn.java_sources contain enough java files

Test: ./update_results.sh
Change-Id: Ic1c053b833d68d36469ac127447d7aafe5828fa2
2022-11-24 13:10:08 +09:00
Cole Faust
417c1d9c3a Remove usages of java_api_finder
This errorprone checker is no longer used.

Bug: 260268418
Test: Presubmits
Change-Id: I055bce5957ae05faef683e3d515332bd119fb720
2022-11-23 15:10:11 -08:00
Chidera Olibie
9ac643c4d4 cronet: change the test dirname to standard cronet/tests/cts format
Test: atest CronetApiTest
Bug: 251012627
Change-Id: I0c168708446e36203a8b9ddf705dfd48624a108e
2022-11-23 18:28:30 +00:00
Hassan Ali
c4f63fa973 Add ConfigInfrastructure lib to Android.bp
As part of moving DeviceConfig.java to
packages/modules/ConfigInfrastructure, We need to add
ConfigInfrastructure lib dependency to Android.bp as DeviceConfig APIs
will not be part of the non-updatable part and will not be part of the
base module_current SDK so we have to add an explicit dependency.

Test: m
bug: 253019048
Change-Id: I29f993342e1baf4e75b30c8d99de10bc087a582b
2022-11-23 11:41:43 +00:00
Chidera Olibie
17e59af62e Merge "Cronet: Fix linting errors for API tests" am: fed31a8387
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2303180

Change-Id: I61a22323cdbcbb75149d79172021aaa2c1a9f486
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-23 10:29:36 +00:00
Chidera Olibie
fed31a8387 Merge "Cronet: Fix linting errors for API tests" 2022-11-23 09:50:22 +00:00
Mark
0e38307b4b Remove dead code: updateUpstreamIPv6LinkProperties in InitialState
mRaemon only be created at BaseServingState#enter() and set to null at
BaseServingState#exit(). Thus, updateUpstreamIPv6LinkProperties just be
no-op in InitialState.

Test: atest TetheringTests MtsTetheringTestLatestSdk CtsTetheringTest
Change-Id: I0b8403a2acffb1aa0f40d2ad8721d4eff7c63ff0
2022-11-23 08:22:32 +00:00
Patrick Rohr
0d086b8b13 Merge changes Idc0f61a5,I678779c2,I28bbe094 am: d1e95e3a5a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2312588

Change-Id: I16401f95adde87df85cbcab32b216c77cba59017
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-23 04:00:37 +00:00
Patrick Rohr
d1e95e3a5a Merge changes Idc0f61a5,I678779c2,I28bbe094
* changes:
  gn2bp: Add cronet_package to update_results.sh
  gn2bp: Fix parsing java sources for multi-arch
  gn2bp: Convert `source_set` with rtti to static_libraries
2022-11-23 03:41:29 +00:00