Commit graph

63,803 commits

Message SHA1
adjust for new T bpfloader net_shared location am: 0736d7bd91 am: 96706b661f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2071008

Change-Id: Iba57cbfe6f3c41fc7c396098f0caa662d68b1e0e
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Maciej Żenczykowski   authored and   Automerger Merge Worker   commited 2022-04-23 09:56:33 +00:00
4249b8be1d
adjust for new T bpfloader net_shared location am: 0736d7bd91
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2071008

Change-Id: I2adb6923269eb15db881a3adb87ea46841df391e
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Maciej Żenczykowski   authored and   Automerger Merge Worker   commited 2022-04-23 09:36:16 +00:00
96706b661f
adjust for new T bpfloader net_shared location
(this is safe because on pre-T none of these maps and programs are mainlined
 and thus safe to access from mainline code anyway)

Test: TreeHugger, manual
Bug: 218408035
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I23e565d665247f33e084978890a1ee8ffe0fe568

Maciej Żenczykowski   commited 2022-04-23 09:03:06 +00:00
0736d7bd91
Merge "Add a method to create a TAP interface with a given interface name." am: 7d7e7cd1fe am: 3c78a24a9a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2059333

Change-Id: I02068707effdb1f3308c4b1997c0ece8bdb21f28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Xiao Ma   authored and   Automerger Merge Worker   commited 2022-04-22 13:40:03 +00:00
a456b23ad5
Merge "Add a method to create a TAP interface with a given interface name." am: 7d7e7cd1fe
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2059333

Change-Id: Id882dfb9510ddc794719e9b3860d0d98ef09f41c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Xiao Ma   authored and   Automerger Merge Worker   commited 2022-04-22 13:24:59 +00:00
3c78a24a9a
Merge "Add a method to create a TAP interface with a given interface name."
Xiao Ma   authored and   Gerrit Code Review   commited 2022-04-22 13:10:19 +00:00
7d7e7cd1fe
Merge "Remove UserId from UID when checking against BLUETOOTH_UID" am: 64ac247056 am: e2a68b9829
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2065564

Change-Id: Ic7542b64306a1a944877a1b381c4984d2dfd1296
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2022-04-22 07:48:47 +00:00
1b6aa95ba4
Merge "Remove UserId from UID when checking against BLUETOOTH_UID" am: 64ac247056
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2065564

Change-Id: If861cf6c2590d28811c46f7e33d5bc5ad73e772a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2022-04-22 07:20:21 +00:00
e2a68b9829
Merge "Remove UserId from UID when checking against BLUETOOTH_UID"
Lorenzo Colitti   authored and   Gerrit Code Review   commited 2022-04-22 06:51:41 +00:00
64ac247056
Merge "Update TEST_MAPPING file." am: 8300421bc5 am: 7f71dfabd0 am: e02db14f42
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2056266

Change-Id: Ifab0a966a494f6946c53cc2b6ce2cb01651ab384
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Sudheer Shanka   authored and   Automerger Merge Worker   commited 2022-04-21 18:39:00 +00:00
49f697725e
Merge "Update TEST_MAPPING file." am: 8300421bc5 am: 7f71dfabd0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2056266

Change-Id: I62afff337b267c55f4e1a8cf75cd74dec0c62ef8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Sudheer Shanka   authored and   Automerger Merge Worker   commited 2022-04-21 18:24:28 +00:00
e02db14f42
Merge "Update TEST_MAPPING file." am: 8300421bc5 am: fa4f870706
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2056266

Change-Id: Id97414ab712cd4a7a0fcc9d7404bc2e9f78224c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Sudheer Shanka   authored and   Automerger Merge Worker   commited 2022-04-21 18:24:27 +00:00
237caa4170
Merge "Update TEST_MAPPING file." am: 8300421bc5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2056266

Change-Id: I1e216217370bee0f12a824bece1ac49d1a62e526
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Sudheer Shanka   authored and   Automerger Merge Worker   commited 2022-04-21 17:51:58 +00:00
fa4f870706
Merge "Update TEST_MAPPING file." am: 8300421bc5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2056266

Change-Id: Id8d2cb2bea50e724c75b7a68eb3449486907b639
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Sudheer Shanka   authored and   Automerger Merge Worker   commited 2022-04-21 17:50:56 +00:00
7f71dfabd0
Merge "Update TEST_MAPPING file."
Sudheer Shanka   authored and   Gerrit Code Review   commited 2022-04-21 17:27:38 +00:00
8300421bc5
Merge "[CLATJ#27] Use ClatdCoordinator since T+ devices" am: b4bf6cea38 am: c028d38b97 am: 26de26d01c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1951099

Change-Id: I2f34f0485d483c91cc1b23d7e04d1a455c5a7ce6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Maciej Żenczykowski   authored and   Automerger Merge Worker   commited 2022-04-21 14:48:18 +00:00
a3e6059315
Merge "[Tetheirng] Refactor carrier config to EntitlementManager" am: 1135676150 am: 48ea1de25a am: c0224c038c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2033668

Change-Id: Ic406a81b04b3f9301713cc0e376668041a1b956a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Tom Hsu   authored and   Automerger Merge Worker   commited 2022-04-21 14:48:07 +00:00
f1657f9e7c
Merge "[CLATJ#27] Use ClatdCoordinator since T+ devices" am: b4bf6cea38 am: 8d75a93995
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1951099

Change-Id: I3878e5359349d8195e8741ea69ae437edab68909
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Maciej Żenczykowski   authored and   Automerger Merge Worker   commited 2022-04-21 14:34:12 +00:00
2fadc5413c
Merge "[CLATJ#27] Use ClatdCoordinator since T+ devices" am: b4bf6cea38 am: c028d38b97
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1951099

Change-Id: If92f66988299f547e14ef80442597ed2f7eb5bf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Maciej Żenczykowski   authored and   Automerger Merge Worker   commited 2022-04-21 14:27:29 +00:00
26de26d01c
Merge "[Tetheirng] Refactor carrier config to EntitlementManager" am: 1135676150 am: 48ea1de25a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2033668

Change-Id: I731881528f4891cf5d34bdd1da7b377470eb785f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Tom Hsu   authored and   Automerger Merge Worker   commited 2022-04-21 14:27:15 +00:00
c0224c038c
Merge "[Tetheirng] Refactor carrier config to EntitlementManager" am: 1135676150 am: 4ba3a8a6fb
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2033668

Change-Id: I3b84544de9942b14bc2e2eb6d80c7eddc7edb916
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Tom Hsu   authored and   Automerger Merge Worker   commited 2022-04-21 14:27:04 +00:00
c83fee7adb
Merge "[CLATJ#27] Use ClatdCoordinator since T+ devices" am: b4bf6cea38
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1951099

Change-Id: I4de5e5b28ce961bcf84f03210585de8dbaefd256
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Maciej Żenczykowski   authored and   Automerger Merge Worker   commited 2022-04-21 14:04:40 +00:00
8d75a93995
Merge "[Tetheirng] Refactor carrier config to EntitlementManager" am: 1135676150
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2033668

Change-Id: Ic9aca26e0b4dafedd3d9134ad80ec19fc887ad1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Tom Hsu   authored and   Automerger Merge Worker   commited 2022-04-21 14:04:25 +00:00
4ba3a8a6fb
Merge "[CLATJ#27] Use ClatdCoordinator since T+ devices" am: b4bf6cea38
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1951099

Change-Id: I2d4a2a5cd07ab4a0bbf5839d7e749e8b0a0dca6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Maciej Żenczykowski   authored and   Automerger Merge Worker   commited 2022-04-21 14:04:05 +00:00
c028d38b97
Merge "[Tetheirng] Refactor carrier config to EntitlementManager" am: 1135676150
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2033668

Change-Id: Ibdf936ef58d84b87f726be02684b6ef1717065b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Tom Hsu   authored and   Automerger Merge Worker   commited 2022-04-21 14:03:34 +00:00
48ea1de25a
Merge "[CLATJ#27] Use ClatdCoordinator since T+ devices"
Maciej Żenczykowski   authored and   Gerrit Code Review   commited 2022-04-21 14:00:23 +00:00
b4bf6cea38
Merge "[SettingsProvider] fix connectivity test" am: 5e64a14ccf am: 8a48719452 am: d4a766fc16
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2065731

Change-Id: I23ea36149da031bc935a4336effdfb444cdb48b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-04-21 13:48:54 +00:00
f928510cab
Merge "[Tetheirng] Refactor carrier config to EntitlementManager"
Tom Hsu   authored and   Gerrit Code Review   commited 2022-04-21 13:43:14 +00:00
1135676150
Merge "[SettingsProvider] fix connectivity test" am: 5e64a14ccf am: 8a48719452
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2065731

Change-Id: I30ce0545947ed99c9f31b801d514c4864eb201c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-04-21 13:33:56 +00:00
d4a766fc16
Merge "[SettingsProvider] fix connectivity test" am: 5e64a14ccf am: bb015ef2af
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2065731

Change-Id: I9aa9ec8377a4fefc687a1282168ed1cb6e47277e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-04-21 13:33:54 +00:00
90d41149b3
Merge "[SettingsProvider] fix connectivity test" am: 5e64a14ccf
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2065731

Change-Id: If61c289b6b66521cb8ca6df442697904f25cd7c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-04-21 13:09:47 +00:00
bb015ef2af
Merge "[SettingsProvider] fix connectivity test" am: 5e64a14ccf
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2065731

Change-Id: Ied8c9709cc7b48d74967c03f84e38d0af9f54d65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-04-21 13:09:06 +00:00
8a48719452
Merge "[SettingsProvider] fix connectivity test"
Treehugger Robot   authored and   Gerrit Code Review   commited 2022-04-21 12:41:49 +00:00
5e64a14ccf
Merge "Update some descriptions and refine code" am: db9f10c8cc am: 4b07e37491 am: ad8f8f24a4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2063711

Change-Id: I2c64a06b04c1d53cb71cc384acb323e6810bab41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Paul Hu   authored and   Automerger Merge Worker   commited 2022-04-21 10:20:56 +00:00
f013288d70
Merge "Update some descriptions and refine code" am: db9f10c8cc am: 4b07e37491
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2063711

Change-Id: I636b3593f1b80bb9025db0cfda46630a3692dd61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Paul Hu   authored and   Automerger Merge Worker   commited 2022-04-21 09:56:58 +00:00
ad8f8f24a4
Merge "Update some descriptions and refine code" am: db9f10c8cc am: 0beef85fd0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2063711

Change-Id: I41d6996752febb5c3a1ebf9563773b84814e0d3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Paul Hu   authored and   Automerger Merge Worker   commited 2022-04-21 09:56:57 +00:00
f905a201d5
Merge "Update some descriptions and refine code" am: db9f10c8cc
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2063711

Change-Id: Iec11fa8c70b9ddb46069596a2f37d93bc443691c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Paul Hu   authored and   Automerger Merge Worker   commited 2022-04-21 09:32:02 +00:00
0beef85fd0
Merge "Update some descriptions and refine code" am: db9f10c8cc
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2063711

Change-Id: I60d3d8493d31caa4b5b5a907c78c2a9ab124a18e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Paul Hu   authored and   Automerger Merge Worker   commited 2022-04-21 09:31:10 +00:00
4b07e37491
Merge "Update some descriptions and refine code"
Paul Hu   authored and   Gerrit Code Review   commited 2022-04-21 09:13:58 +00:00
db9f10c8cc
Add a method to create a TAP interface with a given interface name.
Add a method that allows the caller to specify whether to create a
tap interface with a given specific interface name instead of the
default one. So far only the given name that starts with "v4-testtap"
or "v4-testtun" prefix is allowed. That's helpful to create a clat
interface which always has "v4-" clat prefix in the IpClient integration
test, to verify the callbacks happend on adding/removing clat interface.

Bug: 163492391
Test: atest CtsNetTestCases
Change-Id: I9ea7013fce919cafb719998a123164b5507f9ac0

Xiao Ma   commited 2022-04-21 16:57:22 +09:00
8bbb8089d7
Merge "Remove the legacy ethernet config resource check." am: 59e5df01d2 am: ade1cd9b13 am: a7187c08fa
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2062174

Change-Id: I226acc67310f8e367d4ac362a151212b9181bb16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-04-21 06:39:50 +00:00
83e753f290
Merge "Remove the legacy ethernet config resource check." am: 59e5df01d2 am: ade1cd9b13
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2062174

Change-Id: Ia600dcabb0ea3937be57534b4a80119657e6c9b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-04-21 06:25:27 +00:00
a7187c08fa
Merge "Remove the legacy ethernet config resource check." am: 59e5df01d2 am: 687f093ce2
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2062174

Change-Id: Ic78ff152560f1fd788eb0ef9c02eb6bd98a10901
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-04-21 06:25:25 +00:00
c14b6e9049
Merge "Remove the legacy ethernet config resource check." am: 59e5df01d2
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2062174

Change-Id: I688b65df9c50faecb4ee2684def6fd1699cc091e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-04-21 06:09:43 +00:00
687f093ce2
Merge "Remove the legacy ethernet config resource check." am: 59e5df01d2
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2062174

Change-Id: I6c097bc6b14551f8662ed1c17520f32b1e79aff3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-04-21 06:08:52 +00:00
ade1cd9b13
Merge "Remove the legacy ethernet config resource check."
Treehugger Robot   authored and   Gerrit Code Review   commited 2022-04-21 05:55:07 +00:00
59e5df01d2
[CLATJ#27] Use ClatdCoordinator since T+ devices
- For clatd start and stop, use ClatdCoordinator on T+ and Netd on S-
- Fix the unit test for T+ and S- devices
  Note that mokito.verify(.., times(1)) is replaced by verify(..)
  because times(1) is the default and can be omitted.
  See verify in mockito/src/main/java/org/mockito/Mockito.java

Note that this commit needs to be merged with aosp/1956072.

Bug: 212345928
Test: atest FrameworksNetTests
      manual test
      1. Connect to ipv6-only wifi.
      2. Try IPv4 traffic.
         $ ping 8.8.8.8
      3. Check bpf entries are added
      4. Disconnect from ipv6-only wifi.
      5. Check bpf entries are removed
      6. testipv4.com shows 10/10

Change-Id: I7dfda6eec19de94e4258971effcd8a1210542473

Hungming Chen   commited 2022-04-21 13:24:36 +08:00
eb15a2d816
Merge "Deflake testStartStopVpnProfileV6 and testStartStopVpnProfileV4" am: b458c41700 am: 49451077aa am: 2910919f60
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2063545

Change-Id: Ifded0cf35d7a09632e86a723e386fbe405a0a7db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Chiachang Wang   authored and   Automerger Merge Worker   commited 2022-04-21 05:13:40 +00:00
91cf9d2e57
Merge "Deflake testStartStopVpnProfileV6 and testStartStopVpnProfileV4" am: b458c41700 am: 49451077aa
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2063545

Change-Id: I0b7e153aaf91e63839dbacf447117749ffe5d44a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Chiachang Wang   authored and   Automerger Merge Worker   commited 2022-04-21 04:59:09 +00:00
2910919f60
Merge "Deflake testStartStopVpnProfileV6 and testStartStopVpnProfileV4" am: b458c41700 am: 5348b24f7d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2063545

Change-Id: I2c18752f7e15e1754f1519b2eeffeb5978611c4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Chiachang Wang   authored and   Automerger Merge Worker   commited 2022-04-21 04:57:55 +00:00
ed4c494b8c