Merge changes Ic490fee6,If78047c3 into main am: 10353d5351
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2539630
Change-Id: Iaf929fd1c8253f684d7b5508ba1845f01b2e6ebe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Jean Chalard
authored and
Automerger Merge Worker
commited 2023-10-12 11:41:13 +00:00
433bebfbf2
Merge changes Ic490fee6,If78047c3 into main
...
* changes:
Add hidden constants for communicating about local network agents
Use isAtLeast* from deps
Jean Chalard
authored and
Gerrit Code Review
commited 2023-10-12 11:01:36 +00:00
10353d5351
Merge "Update mActiveIdleTimers to use netId as a key" into main am: 9b6420bc13
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2606672
Change-Id: I540b3bcf5c839ea687e4783dc9b8c690fe8d4c0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Motomu Utsumi
authored and
Automerger Merge Worker
commited 2023-10-12 09:46:09 +00:00
6c596c2151
Merge "Update mActiveIdleTimers to use netId as a key" into main
Motomu Utsumi
authored and
Gerrit Code Review
commited 2023-10-12 09:10:22 +00:00
9b6420bc13
Merge "Stop the created handler threads on the tests" into main am: 0b5d785096
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2784088
Change-Id: Ieeb59747bffb69d30b357be6ec1bd0b60235a18b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Paul Hu
authored and
Automerger Merge Worker
commited 2023-10-12 07:50:04 +00:00
24b2107858
Merge "Stop the created handler threads on the tests" into main
Paul Hu
authored and
Gerrit Code Review
commited 2023-10-12 07:13:30 +00:00
0b5d785096
Add hidden constants for communicating about local network agents
...
Test: FrameworksNetTests
Change-Id: Ic490fee6ee70d74acff0a290199b2946817173d0
Chalard Jean
commited 2023-10-12 13:30:49 +09:00
d6f4efb1a8
Use isAtLeast* from deps
...
CSTest and CSAgentWrapper need to agree on what the current
version is
Test: CSTest*
Change-Id: If78047c36ce213a531207d25b410e870691fbb98
Chalard Jean
commited 2023-10-12 13:30:49 +09:00
5efbcf7bab
Merge changes Ibb8d33b7,Ie168fe1f,I9f699b63 into main am: 02193c0cce
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2775660
Change-Id: Idfe90978dd19fe7ba676fb2c30c62b632ff3fe90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Jean Chalard
authored and
Automerger Merge Worker
commited 2023-10-12 02:50:12 +00:00
603dbe7b6b
Stop the created handler threads on the tests
...
The created handler thread will stay there for a while until
all the tests are finished. This is considered as a leakage
which will take the resource from the devices. In low end
devices, this may possibly impact the performance. The created
threads should be closed explicitly.
Test: atest ConnectivityCoverageTests ConntrackSocketTest
Change-Id: Ic1beb2a210e7c8c80c66fc9e0727c47599150672
Paul Hu
commited 2023-10-12 10:25:03 +08:00
ebbbf8f470
Merge changes Ibb8d33b7,Ie168fe1f,I9f699b63 into main
...
* changes:
Prepare exposing Network{Request,Caps}.forbiddenCapabilities
Add a keep connected for test reason
Improvements to CSTest : legacy type, wait for LOST, permissions
Jean Chalard
authored and
Gerrit Code Review
commited 2023-10-12 02:14:52 +00:00
02193c0cce
Merge "Prepare for keeping concrete overrides of abstract methods" into main am: 415773ed06
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2781647
Change-Id: Ifd362f53189cadfee8ca267d5f16288512a482e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Jihoon Kang
authored and
Automerger Merge Worker
commited 2023-10-11 21:09:39 +00:00
31e55bbe5a
Merge "Prepare for keeping concrete overrides of abstract methods" into main
Jihoon Kang
authored and
Gerrit Code Review
commited 2023-10-11 21:02:18 +00:00
415773ed06
Merge changes Ib24809ec,Id9d26435 into main am: 270813c4c5
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2727558
Change-Id: Ia5e7c5d40c665230fb7310ba4eae7e902dd1f16e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Hansen Kurli
authored and
Automerger Merge Worker
commited 2023-10-11 12:38:03 +00:00
9d591e7696
Merge changes Ib24809ec,Id9d26435 into main
...
* changes:
Remove the fail case on IPv6 in testLockdownVpn
Remove LockdownVpnTracker from testLegacyLockdownVpn
Hansen Kurli
authored and
Gerrit Code Review
commited 2023-10-11 12:03:37 +00:00
270813c4c5
Prepare exposing Network{Request,Caps}.forbiddenCapabilities
...
This is useful going forward in particular because there will
be a default forbidden capability for LOCAL_NETWORKS. This
means it will be useful to be able to remove it.
It is also generally useful and we have been wanting to open
this API to the public, so this is a good opportunity to do so.
Test: new tests for NetworkRequest
NetworkCapabilitiesTest already has tests because it
already was @SystemApi
Change-Id: Ibb8d33b799f2d274326fd9cd0b05a2c33a18032a
Chalard Jean
commited 2023-10-11 17:02:52 +09:00
cf7dbcae41
Add a keep connected for test reason
...
This has been sorely needed for a while. Instead of filing requests
for each of your networks in a CSTest, which is fiddly at best and
sometimes almost impossible (because you can't single out the network),
you can now add this flag and be done with it.
Test: CSKeepConnectedTest
Change-Id: Ie168fe1f3a17de035fdf05e3d6580d3262a3448e
Chalard Jean
commited 2023-10-11 17:02:52 +09:00
c517fb1247
Improvements to CSTest : legacy type, wait for LOST, permissions
...
• Make sure all Agents have a legacy type. This is necessary to
avoid crashes in LegacyNetworkTracker
• Wait for LOST when disconnecting a network
• Make sure the test package sees its own permissions (importantly
it can't see background networks otherwise, because it lacks
CHANGE_NETWORKING_STATE)
Test: in the followup
Change-Id: I9f699b6372a8fe0d5bcd5310d8f35f72e48a6c61
Chalard Jean
commited 2023-10-11 17:02:51 +09:00
026ca940d9
build netbpfload into the tethering apex am: a2a3d754a6
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2781564
Change-Id: I8bbd18d6ee60024b177235f221602f267082c110
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Maciej Żenczykowski
authored and
Automerger Merge Worker
commited 2023-10-11 04:10:01 +00:00
b8f98c3155
build netbpfload into the tethering apex
...
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Id68aece26115808c2b1b795b9395208f5066f87c
Maciej Żenczykowski
commited 2023-10-10 16:51:01 -07:00
a2a3d754a6
Merge changes from topic "netbpfload" into main am: 9c01dd494d
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2779973
Change-Id: I0a7a68d2d363911221c3572fff2b63e4f4e4f4a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Maciej Żenczykowski
authored and
Automerger Merge Worker
commited 2023-10-10 17:48:42 +00:00
f68240fb93
netbpfload: remove support for limiting selinux contexts am: af07d6db1f
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2779972
Change-Id: I48ad5459dbad46afe26430987de5214397cfafb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Maciej Żenczykowski
authored and
Automerger Merge Worker
commited 2023-10-10 17:48:39 +00:00
d343aebe65
netbpfload: do not create /sys/fs/bpf/loader subdir am: 857399114e
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2779971
Change-Id: I7f257c05402a1d3c82018931f87a617330a42e92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Maciej Żenczykowski
authored and
Automerger Merge Worker
commited 2023-10-10 17:48:36 +00:00
75a31b742c
type safety for 'bool downstream' am: e1a615ad83
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2779970
Change-Id: Ifd2e944cb0574b35ade9bf836fb4e0e097e59161
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Maciej Żenczykowski
authored and
Automerger Merge Worker
commited 2023-10-10 17:48:32 +00:00
96af102cdf
type safety for 'bool updatetime' am: 8a6c6d50c0
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2779969
Change-Id: I0a3f7b29e42ef3730644e8b8995f2c29f2ecfe23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Maciej Żenczykowski
authored and
Automerger Merge Worker
commited 2023-10-10 17:48:29 +00:00
a31607b98b
Reword a comment for accuracy am: f70919fbec
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2780320
Change-Id: If9dc04ad8b06db1f0b7b9f1396944abd1ac4cc7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Chalard Jean
authored and
Automerger Merge Worker
commited 2023-10-10 17:47:58 +00:00
cc39865337
Merge changes from topic "netbpfload" into main
...
* changes:
netbpfload: remove netbpfload.rc
netbpfload: remove support for limiting selinux contexts
netbpfload: do not create /sys/fs/bpf/loader subdir
type safety for 'bool downstream'
type safety for 'bool updatetime'
Maciej Żenczykowski
authored and
Gerrit Code Review
commited 2023-10-10 17:23:50 +00:00
9c01dd494d
Prepare for keeping concrete overrides of abstract methods
...
Currently, metalava will discard concrete overrides of abstract methods
from the API signature files which causes problems when attempting to
generate stubs from those files and also discards information that may
be important in API reviews. This change is the first step in the
process of changing that behavior.
This change hard codes the current behavior for discarding the concrete
overrides (`add-additional-overrides=no`) into those signature files
that will (or are likely) to be affected by the change in behavior.
That allows the default behavior to be changed for all the other files
without affecting these.
Follow up changes will remove the hard coding from the signature files
and will update the contents which will include the concrete overrides
of the abstract methods.
More information and the background for this change is available at
go/add-overriding-one-pager.
Test: m checkapi
Bug: 299366704
Change-Id: I52c5bbe2e3bbd36019fe44fcb0b2d19876a5a869
Paul Duffin
commited 2023-10-10 17:11:25 +01:00
7bd2d108ea
Allow for mocking an SDK in the tests am: eb66389d6a
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2775659
Change-Id: I0006590089e943f7299b7ea6fb24d8e26f797c55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Chalard Jean
authored and
Automerger Merge Worker
commited 2023-10-10 11:50:16 +00:00
57682152d8
Reword a comment for accuracy
...
Test: none needed
Change-Id: I7e409827adc86fc13975f394100889a6bf0f1e50
Chalard Jean
commited 2023-10-10 20:12:40 +09:00
f70919fbec
netbpfload: remove support for limiting selinux contexts
...
No need for this, as we simply only support those selinux
contexts (and directories) which are available to networking.
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I35b134c57411f82514b9f7148411f83d3aee1927
Maciej Żenczykowski
commited 2023-10-10 03:46:06 -07:00
af07d6db1f
netbpfload: remove netbpfload.rc
...
I think it's better to just put this in bpfloader.rc,
where we can guarantee the correct ordering.
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ie2c5ab1cb1de015397ac54867ae6bb0c4321d207
Maciej Żenczykowski
commited 2023-10-10 03:46:06 -07:00
1d2c93d568
netbpfload: do not create /sys/fs/bpf/loader subdir
...
(it's already created by the platform bpfloader)
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ie22f585cab17fd2bded3d97a9cfe1019b792b69d
Maciej Żenczykowski
commited 2023-10-10 03:37:14 -07:00
857399114e
type safety for 'bool downstream'
...
funky naming 'stream.down', because downstream.downstream is just too long...
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Id234654fa8960e7430fc33119f36fd94b858d242
Maciej Żenczykowski
commited 2023-10-10 03:37:14 -07:00
e1a615ad83
type safety for 'bool updatetime'
...
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I99d51524ba913c46bad64b89778c01164639c85e
Maciej Żenczykowski
commited 2023-10-10 03:37:14 -07:00
8a6c6d50c0
Merge "Use libbase properties for a slight simplification." into main am: af11354ba5
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2779437
Change-Id: Ifb93935c9dcaffa584f62668f67cf6b18c307f8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Maciej Żenczykowski
authored and
Automerger Merge Worker
commited 2023-10-10 06:47:08 +00:00
06ed86013e
Allow for mocking an SDK in the tests
...
Test: in followup patches
Change-Id: I540ce2a455c92be52eb94fbd4b54a2081d04d25e
Chalard Jean
commited 2023-10-10 14:57:22 +09:00
eb66389d6a
Merge "Use libbase properties for a slight simplification." into main
Maciej Żenczykowski
authored and
Gerrit Code Review
commited 2023-10-10 05:56:01 +00:00
af11354ba5
Merge "Expose the netd mock in CSTest to allow verifying calls on it" into main am: 4dec273ab4
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2775658
Change-Id: I45609ae0946f76660315fe12fbe7e8d16a874090
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Jean Chalard
authored and
Automerger Merge Worker
commited 2023-10-10 04:47:55 +00:00
b4870b8d79
Merge "Add missing copyright notices to tests" into main am: e339c6b780
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2775657
Change-Id: Ic0e0e4a5b01c3d9b3ea3de003ab9b57732abdf4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Jean Chalard
authored and
Automerger Merge Worker
commited 2023-10-10 04:47:42 +00:00
c733e3209c
Merge "Expose the netd mock in CSTest to allow verifying calls on it" into main
Jean Chalard
authored and
Gerrit Code Review
commited 2023-10-10 04:17:29 +00:00
4dec273ab4
Merge "Add missing copyright notices to tests" into main
Jean Chalard
authored and
Gerrit Code Review
commited 2023-10-10 04:16:52 +00:00
e339c6b780
Merge changes I163e21fd,I1b0943d3,I3af8e7f1 into main am: 962ac591bc
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2776077
Change-Id: I9ee72278efe0ae97ce1397e147b336d884b7d2f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Treehugger Robot
authored and
Automerger Merge Worker
commited 2023-10-10 03:55:39 +00:00
514ee81657
Merge "Move the delegated prefix validity check to IaPrefixOption class." into main am: a1eb2e453f
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2777291
Change-Id: Ie298e623482de91282dcdee43cc41803f08be273
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Xiao Ma
authored and
Automerger Merge Worker
commited 2023-10-10 03:55:26 +00:00
844fc53a48
Merge changes I163e21fd,I1b0943d3,I3af8e7f1 into main
...
* changes:
netbpfload: remove support for limiting program types
netbpfload: remove non-network program types
netbpfload: add Android.bp file
Treehugger Robot
authored and
Gerrit Code Review
commited 2023-10-10 03:52:05 +00:00
962ac591bc
Merge "Move the delegated prefix validity check to IaPrefixOption class." into main
Xiao Ma
authored and
Gerrit Code Review
commited 2023-10-10 03:27:35 +00:00
a1eb2e453f
Use libbase properties for a slight simplification.
...
Test: treehugger
Change-Id: If699230d0bf71ce521d7175da707e42b78ae4886
Elliott Hughes
authored and
Maciej Żenczykowski
commited 2023-10-09 23:57:48 +00:00
497e3e05a5
Merge "Clean up obsolete aliases for Truth." into main am: 22d08770af
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2776858
Change-Id: Idb8523792dd07f4ea09643b7d335a962ed776faf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Krzysztof Kosiński
authored and
Automerger Merge Worker
commited 2023-10-09 23:38:39 +00:00
0cf04025c8
Merge "Clean up obsolete aliases for Truth." into main
Krzysztof Kosiński
authored and
Gerrit Code Review
commited 2023-10-09 23:08:57 +00:00
22d08770af
Merge changes Ib48cc2b8,I3f0a12f1 into main am: 2c2c707d6c
...
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2778286
Change-Id: Iae64730cd41602ec7f1072f5bddff291457693d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Maciej Żenczykowski
authored and
Automerger Merge Worker
commited 2023-10-09 18:24:23 +00:00
fc919f3d7b