LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
43,456 Commits 2 Branches 0 Tags
af3798b8e528dd6b2acffbf2a381d4c1fca93d54
Commit Graph

43456 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Hu
af3798b8e5 Merge "Add DEFAULT_NETWORK_PRIORITY constants" into sc-dev am: dcba997adf am: ab4b8bc600 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14731886

Change-Id: If462f369e2cf7a74a0a5895073743e27f832ac0e
 2021-06-14 15:49:38 +00:00
Paul Hu
ab4b8bc600 Merge "Add DEFAULT_NETWORK_PRIORITY constants" into sc-dev am: dcba997adf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14731886

Change-Id: Iabe8738dc2579bd89f6be377666c4e7a9178b1a6
 2021-06-14 15:33:35 +00:00
Paul Hu
dcba997adf Merge "Add DEFAULT_NETWORK_PRIORITY constants" into sc-dev 2021-06-14 15:17:23 +00:00
Paul Hu
956a745b0c Merge "Add more unit tests for mobile data preferred uids feature" into sc-dev am: 7d5fa3da7d am: 31c7026ff9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14731884

Change-Id: Ibdabad67e50a184f330ed884c6acb99ca2602959
 2021-06-14 15:02:52 +00:00
Paul Hu
714af33653 Merge "Add more unit tests for mobile data preferred uids feature" into sc-dev am: 7d5fa3da7d am: fccce46a7c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14731884

Change-Id: I616f67b162618e7b195adf167cbaa62990c3ff50
 2021-06-14 15:02:30 +00:00
Paul Hu
fccce46a7c Merge "Add more unit tests for mobile data preferred uids feature" into sc-dev am: 7d5fa3da7d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14731884

Change-Id: I89634550c0e426be5419ffcc2ff066225446aa5a
 2021-06-14 14:48:29 +00:00
Paul Hu
31c7026ff9 Merge "Add more unit tests for mobile data preferred uids feature" into sc-dev am: 7d5fa3da7d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14731884

Change-Id: I5a97d3caea19c51597c63319bbb8a720c7f91977
 2021-06-14 14:47:46 +00:00
Paul Hu
7d5fa3da7d Merge "Add more unit tests for mobile data preferred uids feature" into sc-dev 2021-06-14 14:29:29 +00:00
Lorenzo Colitti
4b80e297e7 Merge "Correctly get uids for per-app network preferences" am: 473ddeaebb am: d9c5536026 am: 9088465b13 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1723617

Change-Id: I90636ede4f7136f475b992b0a2319fcb10e195d6
 2021-06-14 06:45:17 +00:00
Lorenzo Colitti
9088465b13 Merge "Correctly get uids for per-app network preferences" am: 473ddeaebb am: d9c5536026 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1723617

Change-Id: I1b99d78702c91ce3e4c69de95e09a0c1e7d7e4b5
 2021-06-14 06:32:56 +00:00
Lorenzo Colitti
d9c5536026 Merge "Correctly get uids for per-app network preferences" am: 473ddeaebb 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1723617

Change-Id: Ibe5eac43f2c21c9ad5ea956a645d4ce59dcd7759
 2021-06-14 06:19:02 +00:00
Lorenzo Colitti
2f0f28f8c5 [automerger skipped] Merge changes I944f4c6a,I69cf58bc into sc-dev am: cd60e94a2c -s ours am: a9549e4275 -s ours 
am skip reason: Merged-In I944f4c6ad36206bdccd85a6ea7ef71324a29c685 with SHA-1 beb7d92cbc is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14935383

Change-Id: I6cf14dc358c2adbb6587c3fec086f1e8d6115519
 2021-06-14 06:14:55 +00:00
Lorenzo Colitti
b02e49ae01 [automerger skipped] Merge changes I944f4c6a,I69cf58bc into sc-dev am: cd60e94a2c am: e85cf9b23d -s ours 
am skip reason: Merged-In I944f4c6ad36206bdccd85a6ea7ef71324a29c685 with SHA-1 b4bf015b57 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14935383

Change-Id: I5ffec9d532dac61fbd34f521d7aa8ea75d58bddd
 2021-06-14 06:14:40 +00:00
Lorenzo Colitti
5daa9dd9e1 [automerger skipped] Improve test coverage for disconnecting networks with clat. am: cfa262d8b8 am: 8c0aaba806 -s ours 
am skip reason: Merged-In I69cf58bc87dfe55ea359a2cd76167d03fe2c953d with SHA-1 284ca22f0c is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14935382

Change-Id: I32f355fb3a873b88b6fbf2d574e66d362b32173c
 2021-06-14 06:14:36 +00:00
Lorenzo Colitti
473ddeaebb Merge "Correctly get uids for per-app network preferences" 2021-06-14 06:07:56 +00:00
Lorenzo Colitti
e85cf9b23d Merge changes I944f4c6a,I69cf58bc into sc-dev am: cd60e94a2c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14935383

Change-Id: I580752faf2023115140dfecd1b6de09392203a4d
 2021-06-14 06:05:00 +00:00
Lorenzo Colitti
8c0aaba806 Improve test coverage for disconnecting networks with clat. am: cfa262d8b8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14935382

Change-Id: I081e690c3d3afd1bd0e73d2869172d229863baef
 2021-06-14 06:04:58 +00:00
Lorenzo Colitti
a9549e4275 [automerger skipped] Merge changes I944f4c6a,I69cf58bc into sc-dev am: cd60e94a2c -s ours 
am skip reason: Merged-In I944f4c6ad36206bdccd85a6ea7ef71324a29c685 with SHA-1 b4bf015b57 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14935383

Change-Id: I49a1191f13e16e8c4cbea74cff913f03453168bd
 2021-06-14 06:03:47 +00:00
Lorenzo Colitti
cd60e94a2c Merge changes I944f4c6a,I69cf58bc into sc-dev 
* changes:
  Don't send onLinkPropertiesChanged after onLost for 464xlat.
  Improve test coverage for disconnecting networks with clat.
 2021-06-14 05:51:54 +00:00
Luke Huang
7aad6dd5fc Merge "Modify NsdServiceTest to conform to its new mechanism" am: c9a2bdf2b9 am: 31f8527bca am: 614299c262 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719018

Change-Id: I0aa928303428b875c0be0618e04d5940b1b26eed
 2021-06-13 17:39:41 +00:00
Luke Huang
614299c262 Merge "Modify NsdServiceTest to conform to its new mechanism" am: c9a2bdf2b9 am: 31f8527bca 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719018

Change-Id: I2fb0ac98d2f7ae2a2fab3af7bc657f013b59bbc2
 2021-06-13 16:52:06 +00:00
Luke Huang
31f8527bca Merge "Modify NsdServiceTest to conform to its new mechanism" am: c9a2bdf2b9 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719018

Change-Id: I7f81b5f807114c223f53fe8417d904c4dbe5cb39
 2021-06-13 16:09:50 +00:00
Luke Huang
c9a2bdf2b9 Merge "Modify NsdServiceTest to conform to its new mechanism" 2021-06-13 15:20:52 +00:00
Frank Li
9dd2f85c82 Merge "Add test for ConnectivityService API isPrivateDnsBroken" am: 67fe28455d am: 2cb6dca3f6 am: 2348b4a8ae 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719395

Change-Id: Ia7dafe703e9ff2579c57e3a2d130ac6db2e47d46
 2021-06-12 13:39:35 +00:00
Frank Li
2348b4a8ae Merge "Add test for ConnectivityService API isPrivateDnsBroken" am: 67fe28455d am: 2cb6dca3f6 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719395

Change-Id: Ib6eb34ccff924606dc404076f4421e62d13e902d
 2021-06-12 13:25:22 +00:00
Frank Li
2cb6dca3f6 Merge "Add test for ConnectivityService API isPrivateDnsBroken" am: 67fe28455d 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719395

Change-Id: I2ce2517dd8657316d9d8e57e85cf1d8026845be6
 2021-06-12 13:14:36 +00:00
Frank Li
67fe28455d Merge "Add test for ConnectivityService API isPrivateDnsBroken" 2021-06-12 13:02:24 +00:00
TreeHugger Robot
796ddc71cb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0ced5b5e8b -s ours am: d033292467 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14945623

Change-Id: Ia2c67638f31dae6d504f77a30f5d036bc477fd2a
 2021-06-11 17:52:43 +00:00
TreeHugger Robot
f9f1101006 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0ced5b5e8b -s ours am: 07478c2a7b -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14945623

Change-Id: I117702539d9fb8a31a42170f400c1516913d0ccd
 2021-06-11 17:45:13 +00:00
TreeHugger Robot
d033292467 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0ced5b5e8b -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14945623

Change-Id: I312ea41fb1556dcfc23d1ce2ec2e214022a90f79
 2021-06-11 17:35:44 +00:00
TreeHugger Robot
07478c2a7b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0ced5b5e8b -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14945623

Change-Id: I0a96d6ff8e9517f45b948f60b7473542d9f2109b
 2021-06-11 17:34:10 +00:00
TreeHugger Robot
0ced5b5e8b Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-06-11 17:21:37 +00:00
TreeHugger Robot
c62ad1960e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: f259e4fa82 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14945624

Change-Id: Ib9d62db4305e33f64a4ef26fb8bdeb9fb48c6606
 2021-06-11 17:15:18 +00:00
TreeHugger Robot
f259e4fa82 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-06-11 17:00:32 +00:00
Lorenzo Colitti
beb7d92cbc Don't send onLinkPropertiesChanged after onLost for 464xlat. 
Currently, when a network that uses 464xlat is torn down,
NetworkCallbacks will receive onLinkPropertiesChanged after
onLost. This is confusing and incorrect.

The incorrect callback is sent because handleLinkProperties
checks that the netId of the agent still exists, not that the
NetworkAgent is still registered. This is normally correct,
because the NetworkAgent is removed from mNetworkAgentInfos and
the netId are removed from mNetworkForNetId by the same method,
disconnectAndDestroyNetwork.

In this specific case it's not correct, because the call to
handleUpdateLinkProperties is from disconnectAndDestroyNetwork
itself via nai.clatd.update and calls Nat464Xlat#stop.

No other callers of handleUpdateLinkProperties are affected
because:

- EVENT_NETWORK_PROPERTIES_CHANGED is called only by
  maybeHandleNetworkAgentMessage, which first checks that the
  NetworkAgent is registered.
- handlePrivateDnsSettingsChanged only looks at registered
  NetworkAgents (it loops over mNetworkAgentInfos).
- handlePrivateDnsValidationUpdate, handleNat64PrefixEvent and
  handleCapportApiDataUpdate call getNetworkAgentInfoForNetId,
  which will correctly determine that the agent is no longer
  registered, since they run on the handler thread and thus
  cannot run at the same time as disconnectAndDestroyNetwork.

The existing code contains a check for the netId being current.
This is intended to ensure that an update from a NetworkAgent
cannot affect another agent with the same Network. This extra
check is not necessary, because code running on the handler
thread can never observe a NetworkAgent in mNetworkAgentInfos
unless mNetworkForNetId maps that NetworkAgent's Network to that
NetworkAgent. This is because mNetworkForNetId is updated by the
same methods as mNetworkAgentInfos, and those updates occur on
the handler thread. So all code on the handler thread will see
those two as consistent.

Bug: 176496580
Test: atest FrameworksNetTests CtsNetTestCases HostsideVpnTests
Original-Change: https://android-review.googlesource.com/1727829
Merged-In: I944f4c6ad36206bdccd85a6ea7ef71324a29c685
Change-Id: I944f4c6ad36206bdccd85a6ea7ef71324a29c685
 2021-06-11 13:46:33 +00:00
Lorenzo Colitti
cfa262d8b8 Improve test coverage for disconnecting networks with clat. 
Ensure that NetworkCallbacks and netd operations are accounted
for. Also add a test for the spurious onLinkPropertiesChanged
callback that is currently send out after onLost.

Bug: 176496580
Test: atest ConnectivityServiceTest
Original-Change: https://android-review.googlesource.com/1729093
Merged-In: I69cf58bc87dfe55ea359a2cd76167d03fe2c953d
Change-Id: I69cf58bc87dfe55ea359a2cd76167d03fe2c953d
 2021-06-11 13:44:46 +00:00
Bill Yi
e421b1eaad Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie74e329e714a4399f121546b858154098e8c60c0
 2021-06-11 10:00:29 +00:00
Bill Yi
d7ec12e91d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ice6b9421c94bb6253595e955e9585eab2115ff61
 2021-06-11 09:59:22 +00:00
paulhu
c2198778ab Add DEFAULT_NETWORK_PRIORITY constants 
- Add default network priority to NetworkRequestInfo.
- The default network priority value is used when issue uid
  ranges rules to netd. Netd will use the priority value and uid
  ranges to generate corresponding ip rules specific to the given
  network preference.

Bug: 171872461
Test: atest FrameworksNetTests
Ignore-AOSP-First: Needs cherry-picks
Change-Id: I0ea71b348492aeb4784d487bed4cfd5d387426ba
 2021-06-11 14:22:33 +08:00
Treehugger Robot
7e45643ed9 [automerger skipped] import copy of bpf_net_helpers.h from system/netd/bpf_progs am: 348d144786 am: 5bfdca6367 -s ours 
am skip reason: Merged-In Ib943321d46254ba64ce206fb9e3b3414d15e4d45 with SHA-1 348d144786 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14937139

Change-Id: I965ab59c5bef34c1ac34bed2304e0ffbb4a2d6ab
 2021-06-11 04:15:20 +00:00
Treehugger Robot
50e9a4a2c0 [automerger skipped] import copy of bpf_net_helpers.h from system/netd/bpf_progs am: 348d144786 -s ours am: dc841076f1 -s ours 
am skip reason: Merged-In Ib943321d46254ba64ce206fb9e3b3414d15e4d45 with SHA-1 23f5d805ed is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14937139

Change-Id: I54fb1ba5ca1e1e600f3915bd88994be16e23729a
 2021-06-11 04:09:43 +00:00
Treehugger Robot
5bfdca6367 import copy of bpf_net_helpers.h from system/netd/bpf_progs am: 348d144786 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14937139

Change-Id: I4b34a9e6879db1d38f44d06f89a809802bf32aa1
 2021-06-11 03:57:42 +00:00
Treehugger Robot
dc841076f1 [automerger skipped] import copy of bpf_net_helpers.h from system/netd/bpf_progs am: 348d144786 -s ours 
am skip reason: Merged-In Ib943321d46254ba64ce206fb9e3b3414d15e4d45 with SHA-1 23f5d805ed is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14937139

Change-Id: I02ee29d7e6458a49278aed987d8b8366edaa9da1
 2021-06-11 03:56:50 +00:00
Remi NGUYEN VAN
4bb45d88ea Merge "Revert "Use mockito-extended in FrameworksNetTests"" am: a6c06af0fa am: 6f6035a29e am: 9134dac0b1 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1734372

Change-Id: Ie28db4a25144eb558bb3c7c72e24c66a38091e2c
 2021-06-11 02:12:04 +00:00
Remi NGUYEN VAN
9134dac0b1 Merge "Revert "Use mockito-extended in FrameworksNetTests"" am: a6c06af0fa am: 6f6035a29e 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1734372

Change-Id: I8c8a2f734c433c0cf6fe158fcbf26a75a82d0d0a
 2021-06-11 01:56:43 +00:00
Remi NGUYEN VAN
6f6035a29e Merge "Revert "Use mockito-extended in FrameworksNetTests"" am: a6c06af0fa 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1734372

Change-Id: I0b5b976cf9de9beb0db7eca9205196a5afd3eab6
 2021-06-11 01:38:23 +00:00
Remi NGUYEN VAN
a6c06af0fa Merge "Revert "Use mockito-extended in FrameworksNetTests"" 2021-06-11 01:26:44 +00:00
Remi NGUYEN VAN
7a80ae85d6 Merge changes I8d15b626,I993e8da9 am: d15e52eca9 am: 3cc611d69a am: 45dd5391ed 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1733772

Change-Id: Ie41a3726bd3f90a957e2507c0c2f90c5024440e4
 2021-06-11 00:19:41 +00:00
Remi NGUYEN VAN
45dd5391ed Merge changes I8d15b626,I993e8da9 am: d15e52eca9 am: 3cc611d69a 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1733772

Change-Id: Ice0291696167275ae20a423b74671d252fe09fb4
 2021-06-11 00:05:52 +00:00
Remi NGUYEN VAN
3cc611d69a Merge changes I8d15b626,I993e8da9 am: d15e52eca9 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1733772

Change-Id: I5bfe6d82ce37628a8b7dfec59f9a8216a3c5dcdf
 2021-06-10 23:50:06 +00:00