Commit graph

71,766 commits

Message SHA1
Merge "Apply "most-recent" delivery policy to CONNECTIVITY_ACTION."
Jean Chalard   authored and   Gerrit Code Review   commited 2023-01-12 06:37:26 +00:00
526df99b53
Merge "Now that Multidex is testonly, drop android-support-multidex"
Motomu Utsumi   authored and   Gerrit Code Review   commited 2023-01-12 04:03:44 +00:00
1fedd9fee1
Merge "Fix invalid base64 map dump when map has no entry"
Motomu Utsumi   authored and   Gerrit Code Review   commited 2023-01-12 01:49:49 +00:00
f2df068d61
Merge "Expose APIs to migrate IpSecTransform"
Yan Yan   authored and   Gerrit Code Review   commited 2023-01-11 18:52:59 +00:00
19aa23db7e
Merge "RateLimitTest: increase tolerance to 30%"
Treehugger Robot   authored and   Gerrit Code Review   commited 2023-01-11 16:17:55 +00:00
519bc968f0
Now that Multidex is testonly, drop android-support-multidex
Test: ./update_result.sh && m
Change-Id: I0e28f27c56627c3576859971ae8ce35030da6b91

Stefano Duo   commited 2023-01-11 16:00:15 +00:00
faef8bc112
Merge "gn2bp: Add JNI jarjaring prefix"
Patrick Rohr   authored and   Gerrit Code Review   commited 2023-01-11 15:09:16 +00:00
d5e981bcd7
RateLimitTest: increase tolerance to 30%
RateLimitTest is still flaky on some (presumably, lower-end) devices.
Increase tolerance to 30% and increase test duration.

Test: TH
Bug: 255692027
Change-Id: I7368d082069d2b4b657b13d136b9f3f8880d4e70

Patrick Rohr   commited 2023-01-11 14:07:59 +00:00
986953b465
Fix invalid base64 map dump when map has no entry
This CL addresses review comment on aosp/2183779

Test: atest SkDestroyListenerTest
Bug: 247031492
Change-Id: Icd03730b9ee6f6d22b05d72b2dc1652d8d9dd65e

Motomu Utsumi   commited 2023-01-11 17:54:48 +09:00
4930e78c4a
Merge "OWNERS: remove prohr's temporary EthernetManagerTest ownership"
Patrick Rohr   authored and   Gerrit Code Review   commited 2023-01-11 08:34:58 +00:00
76ed568a03
Merge "Enterprise slicing for profile blocking default"
Junyu Lai   authored and   Gerrit Code Review   commited 2023-01-11 07:23:58 +00:00
73bf06f6b5
OWNERS: remove prohr's temporary EthernetManagerTest ownership
Change-Id: I5f797c439bea58eb9f438341ade4aa6f371a285d
Test: none

Patrick Rohr   commited 2023-01-11 06:10:51 +00:00
71a62b7d53
Merge "Add MdnsAdvertiser"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2023-01-11 05:45:32 +00:00
125ff06cba
Enterprise slicing for profile blocking default
Test: atest ConnectivityServiceTest#testProfileNetworkPreferenceBlocking_networkChanges \
      ConnectivityServiceTest#testProfileNetworkPreferenceBlocking_changePreference \
      --rerun-until-failure 100
Bug: 263219497

Change-Id: Idbda582542bcabf0156e2bab9f8bea42fc908cae

Junyu Lai   commited 2023-01-11 10:47:00 +08:00
35665cc887
Expose APIs to migrate IpSecTransform
This commit exposes APIs to migrate a tunnel mode transform to
new source/destination addresses, as required by MOBIKE.

By calling the exposed API, the caller only caches the new
address in the transform. To complete the migration, caller
MUST apply the tranform to the appropriate tunnel.

This API design is mainly based on the kernel interface and use
cases. The Linux kernel requires Android to provide both the
IpSecTransform and the IpSecTunnelInterface to perform the
migration. And in most cases those two instances are managed
by different entities: IpSecTranform is managed by the key
exchange protocol (e.g. IKE) and IpSecTunnelInterface is managed by
the security tunnel provider (e.g. VPN, VCN, and IWLAN). Thus the
migration process has been designed to have two steps where the
key exchange protocol negotiates and caches the new address,
passes out the updated transform, and the security tunnel
provider applies the transform to a tunnel.

Another benefit of this API is it can also apply to the case
where the network peer does not support MOBIKE and thus cannot
update the existing transforms. In this case, the key exchange
protocol can create a new transform and give it to the security
tunnel provider, and the tunnel provider can still call "apply"
to perform migration without needing to know the details of the
transform update process.

Bug: 169171001
Test: atest FrameworksNetTests, IpSecManagerTunnelTest
Change-Id: I0658cdb09fb31f7e0fb9d0b07f37c2b72b6e705f

Yan Yan   commited 2023-01-10 19:09:05 +00:00
81c2160a63
gn2bp: Add JNI jarjaring prefix
* Add the prefix to make sure that cronet's implementation still connects correctly through the JNI layer after jarjaring.

Test: atest CtsCronetTestCases
Change-Id: I38cf1aa30b9211d65efc359eb1eae9244dcd7d10

Mohannad Farrag   commited 2023-01-10 16:45:47 +00:00
a4191eb8b2
Merge "cronet: remove apex_available:platform"
Patrick Rohr   authored and   Gerrit Code Review   commited 2023-01-10 15:34:32 +00:00
66e9af6375
cronet: remove apex_available:platform
Remove temporary workaround to b/203203405.

Test: ./update_results.sh
Change-Id: I0457b3e50e5d914eb2c88864710392959619787a

Patrick Rohr   commited 2023-01-10 05:40:38 -08:00
2b3b00efa2
Add MdnsAdvertiser
MdnsAdvertiser takes requests to advertise services on given Networks,
and relays them to internal maps of MdnsInterfaceAdvertisers.
SocketProvider is used to create the sockets for the requested networks.

It also ensures that added services do not have name conflicts, as
registration of one service should use the same name on all interfaces,
so any conflict means that every MdnsInterfaceAdvertiser needs to use a
different name. Names are automatically updated with a number suffix
(like "service (2)", "service (3)"), similarly to the legacy
mdnsresponder implementation.

The implementatio of MdnsInterfaceAdvertiser will be added in a
different change.

Bug: 241738458
Test: atest

Change-Id: I21aa93c681dd179b9d6ec425bc0f247a10ba5b0b

Remi NGUYEN VAN   commited 2023-01-10 22:04:05 +09:00
314db00b3f
Merge "cronet: Add dependency needed to make use of SdkLevel"
Stefano Duo   authored and   Gerrit Code Review   commited 2023-01-10 11:33:14 +00:00
fd71f69ba4
cronet: Add dependency needed to make use of SdkLevel
Test: m with this CL + aosp/2369503

Change-Id: I867ad377fb98a1645a461dafba79266f0cd58cc3

Stefano Duo   commited 2023-01-10 09:58:46 +00:00
0978c0716e
Merge "Add owners for IPsec CTS"
Yan Yan   authored and   Gerrit Code Review   commited 2023-01-09 21:49:10 +00:00
ddaf16a493
Merge changes from topics "2374762-android-bp", "2374763-android-bp"
* changes:
  cronet: sync Android.bp with aosp/2374763
  cronet: sync Android.bp with aosp/2374762

Patrick Rohr   authored and   Gerrit Code Review   commited 2023-01-09 14:22:31 +00:00
d42df9593e
Merge "cronet: update desc_*.json"
Patrick Rohr   authored and   Gerrit Code Review   commited 2023-01-09 12:41:33 +00:00
5690e5f5d0
Merge changes I25096f4c,I40ba22ab
* changes:
  cronet: enable defaults in aosp
  cronet: add defaults to enable / disable Cronet in framework-tethering

Patrick Rohr   authored and   Gerrit Code Review   commited 2023-01-09 09:29:06 +00:00
9e31b74ee5
cronet: sync Android.bp with aosp/2374763
Test: TH
Change-Id: If1d8cd64d0c6be397fa02c4f91696b692677bdd6

Patrick Rohr   commited 2023-01-09 01:17:42 -08:00
c9f2da9e78
cronet: sync Android.bp with aosp/2374762
Test: TH
Change-Id: Icb16f269855bfaa1abe262dee9ceadafea3cc9ca

Patrick Rohr   commited 2023-01-08 22:47:21 -08:00
7716fafea7
Apply "most-recent" delivery policy to CONNECTIVITY_ACTION.
This allows us to skip any older CONNECTIVITY_ACTION broadcasts
waiting to be delivered when a new broadcast is dispatched.

Bug: 255545931
Test: TH
Change-Id: Iac5da2f727e295d1775bfe91358900f316258be4

Sudheer Shanka   commited 2023-01-09 03:21:44 +00:00
2453a3ada2
Merge "fix argument to CloseGuard.open()"
Maciej Żenczykowski   authored and   Gerrit Code Review   commited 2023-01-07 09:54:58 +00:00
33b2163412
Merge "unregistered null callback will cause a crash later"
Steven Moreland   authored and   Gerrit Code Review   commited 2023-01-07 02:11:16 +00:00
f4e0f096b5
fix argument to CloseGuard.open()
Based on documentation, String parameter to CloseGuard.open() should be the name of the method to close the resource (in this case Resource.close()).

As currently written, the debug output from warnIfOpen() will be "Resource failed to call constructor."

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

Maciej Żenczykowski   commited 2023-01-07 01:00:18 +00:00
223b5cc371
Merge "Apply "most-recent" delivery policy to NETWORK_STATS_UPDATED."
Sudheer Shanka   authored and   Gerrit Code Review   commited 2023-01-07 00:10:51 +00:00
4f46dd8d78
Merge "Update bpf helpers to support new ignore_on fields"
Maciej Żenczykowski   authored and   Gerrit Code Review   commited 2023-01-06 20:44:24 +00:00
1f9c939241
cronet: update desc_*.json
Update desc_*.json to be in-sync with external/cronet.

Test: build
Change-Id: I62499573750e79865cdd522a6d685b7db3d8934b

Patrick Rohr   commited 2023-01-06 04:28:55 -08:00
10f77a996d
cronet: enable defaults in aosp
Automerger into tm-mainline-prod is currently broken, so this change
uses a Merged-In line that is already present in tm-mainline-prod (and
downstream from it). This means that this change must also be
cherry-picked into internal-master with a slightly different Merged-In
specification.

Test: TH
Merged-In: I555ad1ed687632cfe8a7e30283f80e80956fc1d4
Change-Id: I25096f4cc21923c602d77a66aad248d52b42b18f

Patrick Rohr   commited 2023-01-06 04:13:56 -08:00
a6d600ff50
cronet: add defaults to enable / disable Cronet in framework-tethering
A similar option already exists in
packages/modules/Connectivity/Cronet/apex/Android.bp. This is in
preparation of adding cronet to framework-tethering. It is possible that
we only end up using one of the variables but better safe than sorry.

This change will be blocked by the blocked automerger into
tm-mainline-prod. If this continues to be a problem, we might have to
play some tricks with automerger.

Test: TH
Change-Id: I40ba22aba041ec12ec2bf2881df14e6c0ee53b44

Patrick Rohr   commited 2023-01-06 04:12:59 -08:00
3b9ba6acdf
Merge changes Ic85de603,I57311234,I28fd8637
* changes:
  gn2bp: Use startswith instead of regex
  gn2bp: Remove unused condition for src path filtering
  gn2bp: Use "out" prefix for src path filtering

Patrick Rohr   authored and   Gerrit Code Review   commited 2023-01-06 11:51:16 +00:00
9a90448aee
Merge "Rename isStrictMode to better names"
Jean Chalard   authored and   Gerrit Code Review   commited 2023-01-06 06:14:26 +00:00
a8e13ec811
Apply "most-recent" delivery policy to NETWORK_STATS_UPDATED.
This allows us to skip any older NETWORK_STATS_UPDATED broadcasts
waiting to be delivered when a new broadcast is dispatched.

Bug: 255525222
Test: TH
Change-Id: I5797fb5f1e190a5445935502500e4274c2dc0be2

Sudheer Shanka   commited 2023-01-06 04:50:51 +00:00
136e603739
gn2bp: Use startswith instead of regex
Test: ./update_results.sh
Change-Id: Ic85de603d6edb3565552731bac60a57961c8aecc

Motomu Utsumi   commited 2023-01-06 11:53:27 +09:00
7841c80557
gn2bp: Remove unused condition for src path filtering
Test: ./update_results.sh
Change-Id: I5731123496490759e5ec3e8f53dd19d8fe6554b4

Motomu Utsumi   commited 2023-01-06 11:53:14 +09:00
4424f34582
gn2bp: Use "out" prefix for src path filtering
instead of "out/test".

Test: ./update_results.sh
Change-Id: I28fd863742f2531bb942a15c636ca311ef45c307

Motomu Utsumi   commited 2023-01-06 11:52:18 +09:00
e5ea57bc4f
unregistered null callback will cause a crash later
Bug: N/A
Change-Id: I7acbc084d8a401817879d416f0283ca40e060069
Test: N/A

Steven Moreland   commited 2023-01-06 02:29:54 +00:00
cf42d60c53
Update bpf helpers to support new ignore_on fields
This change updates callers to include the new ignore_on and bpfloader
arguments as per the change in aosp/2374598.

Bug: 246985031
Test: tethering build & install, full platform build & install
Change-Id: Id940a6003ae4cb0bbfc65db8ff96590c4f3c847b

Ryan Zuklie   commited 2023-01-05 13:26:30 -08:00
cc72fa8f9d
Merge "cronet: add script to generate desc_*.json"
Patrick Rohr   authored and   Gerrit Code Review   commited 2023-01-05 15:47:33 +00:00
e54ec746d7
cronet: add script to generate desc_*.json
It's very basic for now.

Test: run the script
Change-Id: Ie848f8da6936f4300ba5ecdc041523440be25e8a

Patrick Rohr   commited 2023-01-05 07:45:43 -08:00
6d722af6f3
Merge "gn2bp: remove unnecessary chrome_root_store target"
Patrick Rohr   authored and   Gerrit Code Review   commited 2023-01-04 13:20:04 +00:00
95f73110df
Merge "clatd - ipv6 fragment to ipv4 translation support (try 2)"
Maciej Żenczykowski   authored and   Gerrit Code Review   commited 2023-01-04 13:17:21 +00:00
353dce7e87
clatd - ipv6 fragment to ipv4 translation support (try 2)
This is a repeat of:
  https://android-review.git.corp.google.com/c/platform/packages/modules/Connectivity/+/2266447

which was reverted in:
  https://android-review.git.corp.google.com/c/platform/packages/modules/Connectivity/+/2372509

This time with kver >= 4.14 protections of the bpf_skb_adjust_room()
bpf helper which isn't present on 4.9 T devices.

Original change comments:

Tested manually on a flame device connected to an ipv6-only wifi
network (GoogleGuest).

On server:
  nc -4 -l -u -p 443

On client (phone):
  adb shell nc -4 -u my.server 443

On client (phone):
  adb shell tcpdump -l -ee -vv -s 1600 -i v4-wlan0

On client send something to server "Hi."
On server send something to client "Hey!"

You should see normal unfragmented IP packets.

Then on server send something really long (I used 57 copies of the 26 letter English alphabet).  This should be long enough that fragmentation is required.

You should see tcpdump show 2 ipv4 fragments, and netcat
show the packet being delivered correctly.

(and previous versions of the code were buggy and were
resulting in corrupt packets and things not working)

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

Maciej Żenczykowski   commited 2023-01-04 11:35:50 +00:00
9b239528e3
Merge "BpfCoordinator: publish upstream interface mtu to v4 offload rule"
Maciej Żenczykowski   authored and   Gerrit Code Review   commited 2023-01-04 09:38:37 +00:00
74828818df