Commit Graph

1274 Commits

Author SHA1 Message Date
Maciej Żenczykowski
0feccef671 switch from SEC() to DEFINE_BPF_PROG() am: 6b7829f2c1 am: 6258dc0071 am: fc3c4b4dd0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1554237

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I661fdb8f85f6986107931e130aaec711a66c36f2
2021-01-20 08:15:11 +00:00
Maciej Żenczykowski
fc3c4b4dd0 switch from SEC() to DEFINE_BPF_PROG() am: 6b7829f2c1 am: 6258dc0071
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1554237

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0cd270087fc86f39d6c59eb3c3f0a7246c490017
2021-01-20 07:54:49 +00:00
Lorenzo Colitti
a0ef944e66 Merge changes Id87b88f6,I67dfba75 am: fab97c22b2 am: 68a007c616 am: 73d47c1b20
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1538841

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If4ab925309508d2bbdc5f4453aa6e5e047e91919
2021-01-20 05:21:54 +00:00
Maciej Żenczykowski
6b7829f2c1 switch from SEC() to DEFINE_BPF_PROG()
I keep on failing to find this using grep because it
doesn't match how all the other programs are defined,
so change it for consistency.

Test: builds, atest, TreeHugger
Signed-off-by: Maciej Żenczykowski<maze@google.com>
Change-Id: Ib61b375bef84d2b489080866b2411c84880e4ef2
2021-01-20 05:18:50 +00:00
Lorenzo Colitti
73d47c1b20 Merge changes Id87b88f6,I67dfba75 am: fab97c22b2 am: 68a007c616
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1538841

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id99e7f262ceef003a2aff69ccaa0881ae1ca7918
2021-01-20 04:06:03 +00:00
Lorenzo Colitti
fab97c22b2 Merge changes Id87b88f6,I67dfba75
* changes:
  [NFCT.TETHER.6] Migrate tetherOffloadGetAndClearStats from netd to mainline
  [NFCT.TETHER.5] Migrate tetherOffloadSetInterfaceQuota from netd to mainline
2021-01-20 02:19:14 +00:00
Nucca Chen
ab07e59707 Merge changes I969d6182,Ie73f7b4d am: 2668d4a0e2 am: d3e7c33b2e am: 33ee638bae
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1537801

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0d62905c33af794213ce419d309d953bafda94d9
2021-01-19 12:40:32 +00:00
Maciej Żenczykowski
4597b2e52e Merge "move bpf test map into a separate file" am: ab44322f9c am: e15c4e0281 am: 866a65d07c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1554234

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2dce9aedb87226fffe2805968ba4f0e08545f896
2021-01-19 12:39:59 +00:00
Nucca Chen
33ee638bae Merge changes I969d6182,Ie73f7b4d am: 2668d4a0e2 am: d3e7c33b2e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1537801

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I586aa838949f55780d7cd80384d6f1c90a392c5e
2021-01-19 12:00:12 +00:00
Maciej Żenczykowski
866a65d07c Merge "move bpf test map into a separate file" am: ab44322f9c am: e15c4e0281
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1554234

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I92792b09a33e78a86ecaa96a70654a3bca181335
2021-01-19 12:00:00 +00:00
Nucca Chen
2668d4a0e2 Merge changes I969d6182,Ie73f7b4d
* changes:
  [NFCT.TETHER.4] Migrate tetherOffloadRuleRemove from netd to mainline
  [NFCT.TETHER.3] Migrate tetherOffloadGetStats from netd to mainline
2021-01-19 11:29:22 +00:00
Maciej Żenczykowski
e9810ffef1 move bpf test map into a separate file
This allows for better separation of test vs production code:
we will add more test maps and programs here later.

Test: builds
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I7b22e3e148ebf43fdf43dc68d0dea354f7627688
2021-01-18 18:36:00 -08:00
Nucca Chen
071607ba28 Merge "[NFCT.TETHER.2] Migrate tetherOffloadRuleAdd from netd to mainline" am: 6bc18e6d2c am: 79f0ca8849 am: 0f360d1d11
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1536562

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifebd26d45f2be22e7ec8b0936aeb9d102e2d3c26
2021-01-18 08:20:27 +00:00
Nucca Chen
0f360d1d11 Merge "[NFCT.TETHER.2] Migrate tetherOffloadRuleAdd from netd to mainline" am: 6bc18e6d2c am: 79f0ca8849
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1536562

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9e3adfd593a190d97a72d591359e06d6a31d0bde
2021-01-18 07:21:10 +00:00
Nucca Chen
6bc18e6d2c Merge "[NFCT.TETHER.2] Migrate tetherOffloadRuleAdd from netd to mainline" 2021-01-18 06:37:23 +00:00
Les Lee
9edd34ee20 Merge "wifi: Add bridged pre-fix for tethering interface" am: 7e9e19c1ea am: 8f9ffbb097 am: 46116ca234
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1542725

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie54503ed9fc92fbda08316859183c82f1c1846ef
2021-01-18 02:57:22 +00:00
Les Lee
46116ca234 Merge "wifi: Add bridged pre-fix for tethering interface" am: 7e9e19c1ea am: 8f9ffbb097
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1542725

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I25fd5ec86c1c25bcaa4c4bbe5337d8027dff88ad
2021-01-18 02:42:45 +00:00
Les Lee
7e9e19c1ea Merge "wifi: Add bridged pre-fix for tethering interface" 2021-01-18 01:21:45 +00:00
lesl
6a953ef4d3 wifi: Add bridged pre-fix for tethering interface
In bridged mode, the tethered interface will include the prefix ap_br_

Bug: 162686273
Test: Manual Test - bridged AP enabled success
and client can connected it and get the IP address
Test: atest -c NetworkStackTests
Test: atest -c FrameworksNetTests
Test: atest -c CtsNetTestCasesLatestSdk
Change-Id: I89ae178c658a42f902199afaed89ec798de54643
2021-01-18 01:21:32 +00:00
Hungming Chen
6971e91d62 [NFCT.TETHER.6] Migrate tetherOffloadGetAndClearStats from netd to mainline
A preparation for updating BPF map in mainline module.

Test: atest TetheringCoverageTests
Change-Id: Id87b88f6dfcdfe5765756442ed880933cd1c6baf
2021-01-15 18:40:55 +08:00
Hungming Chen
67c14b549f [NFCT.TETHER.5] Migrate tetherOffloadSetInterfaceQuota from netd to mainline
A preparation for updating BPF map in mainline module.

Test: atest TetheringCoverageTests
Change-Id: I67dfba750c7303e4aeaf65f5086db1290d176b4d
2021-01-15 18:40:48 +08:00
Hungming Chen
5ea9c4b64a [NFCT.TETHER.4] Migrate tetherOffloadRuleRemove from netd to mainline
A preparation for updating BPF map in mainline module.

Test: atest TetheringCoverageTests
Change-Id: I969d6182a307f46c8ed0a30960deb460ecedd8ea
2021-01-15 18:40:40 +08:00
Hungming Chen
b350d7589f [NFCT.TETHER.3] Migrate tetherOffloadGetStats from netd to mainline
A preparation for updating BPF map in mainline module.

Test: TetheringCoverageTests
Change-Id: Ie73f7b4d9b191e62cfdfe2cfa3360cc7210f17e8
2021-01-15 17:11:12 +08:00
Hungming Chen
dd55b91228 [NFCT.TETHER.2] Migrate tetherOffloadRuleAdd from netd to mainline
A preparation for updating BPF map in mainline module.

Test: atest TetheringCoverageTests
Change-Id: I6f8667bf110dae3e2805c2752ff59e7284a7bce0
2021-01-15 17:10:58 +08:00
Maciej Żenczykowski
41309558d9 Merge "Use header module bpf_syscall_wrappers" am: 539d0e27cf am: 034c6c7d12 am: 8cd034fd8e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1549715

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaf71b838bb4f2626e277351ea729a58b215551f6
2021-01-14 09:06:02 +00:00
Maciej Żenczykowski
8cd034fd8e Merge "Use header module bpf_syscall_wrappers" am: 539d0e27cf am: 034c6c7d12
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1549715

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie3a1ff6efba86ef3fb3d554b1807448aa56b4956
2021-01-14 08:27:24 +00:00
Hungming Chen
400702b6bb Use header module bpf_syscall_wrappers
Use the versioned header library instead of just including
the header files.

Test: atest BpfMapTest
Change-Id: Icf23dcdc051a4ead6a7c6e925159cdc27f49eac2
2021-01-13 14:31:28 +08:00
Hungming Chen
7a70d825db Follow-up CL to the change at aosp/1498277 am: 7d05e6fddd am: 0276690274 am: d40aa01f07
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1547695

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia79c2d0f20241af73149cec27ff2d16c24cc3758
2021-01-12 15:14:45 +00:00
Hungming Chen
d40aa01f07 Follow-up CL to the change at aosp/1498277 am: 7d05e6fddd am: 0276690274
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1547695

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibef2b8d76779536b28c42d421c24516d94cee826
2021-01-12 14:59:23 +00:00
Hungming Chen
7d05e6fddd Follow-up CL to the change at aosp/1498277
1. Correct the API annotation.
2. The entry deletion failure causes the exception in cleanTestMap().
3. Use AtomicInteger to be the counter in the lambda.

Test: atest BpfMapTest
Change-Id: I4a56038881a38bda993ef5303b71f0e2a99f03d1
2021-01-12 19:08:15 +08:00
Nucca Chen
adfb2526bc Merge "Provide a easy way to access bpf maps from java" am: 12067258b2 am: 5a90ec8297 am: f9e96b9ce9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1498277

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib1a990bdc66510c3c9c7e87715adb59b581d3c1c
2021-01-12 09:37:33 +00:00
Nucca Chen
f9e96b9ce9 Merge "Provide a easy way to access bpf maps from java" am: 12067258b2 am: 5a90ec8297
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1498277

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I07d7df06f0623b176094c15e0e9c2e24e0b1c078
2021-01-12 09:00:30 +00:00
Nucca Chen
12067258b2 Merge "Provide a easy way to access bpf maps from java" 2021-01-12 08:06:03 +00:00
Remi NGUYEN VAN
822ef077c6 Merge "Revert^2 "Add service-connectivity to tethering APEX"" am: 73fa31b404 am: f3b8223844 am: a8208c50f8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1542627

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie4424773b4547c6f09a99024da94aefedd696552
2021-01-12 03:42:16 +00:00
Remi NGUYEN VAN
a8208c50f8 Merge "Revert^2 "Add service-connectivity to tethering APEX"" am: 73fa31b404 am: f3b8223844
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1542627

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I14b6da2e75fce0274e64701cf79dca46abad0f60
2021-01-12 02:21:57 +00:00
Remi NGUYEN VAN
73fa31b404 Merge "Revert^2 "Add service-connectivity to tethering APEX"" 2021-01-12 01:35:30 +00:00
markchien
7052688dde Provide a easy way to access bpf maps from java
A wrapper for bpf map opening, reading/writing, and iteration.

Bug: 173167302
Test: atest BpfMapTest

Change-Id: I792b41978b322c9e4969cd7b6c35d6978ab86bc4
2021-01-11 17:43:27 +08:00
lucaslin
cb561f4183 Move BaseNetdUnsolicitedEventListener to frameworks/libs/net am: ee661dfb59 am: 8c250ac624 am: 5970ac8892
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1517960

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4883d85dcef3dcb9c56abdd4ab75f99cad2778f8
2021-01-11 02:52:05 +00:00
lucaslin
5970ac8892 Move BaseNetdUnsolicitedEventListener to frameworks/libs/net am: ee661dfb59 am: 8c250ac624
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1517960

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I859a59302fb71fae2da2ca229c706ff6c1f16408
2021-01-11 02:22:44 +00:00
lucaslin
ee661dfb59 Move BaseNetdUnsolicitedEventListener to frameworks/libs/net
Move BaseNetdUnsolicitedEventListener to frameworks/libs/net and
create a new library - netd-client for using.
Also remove netd_aidl_interface-unstable-java since netd-client
links to the stable one.

Bug: 174837473
Test: Manual test and check the log.
Change-Id: Id65142b8c13a6cccbfe387d4ab757967497546e6
2021-01-08 01:55:53 +00:00
Remi NGUYEN VAN
2812f607a0 Revert^2 "Add service-connectivity to tethering APEX"
Add the connectivity service JAR to the tethering APEX.
This change should not be released in monthly updates until the
modularization work is done, so will be reverted in module release
branches.

This rolls forward the change. The original topic was reverted because
of a bad merged-in clause; this is fixed and re-verified in this topic.

Test: Boot, wifi connects and has internet access
Bug: 171540887

Change-Id: Ib0ac49609e444a53a6fee4575f5078e15f364eef
2021-01-08 01:24:36 +00:00
Treehugger Robot
42e3663c76 Merge "Revert "Add service-connectivity to tethering APEX"" am: 4f430ae5ec am: 67650555b1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1541543

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I77fdad4bf192ba260118f6ef2b7c2fd0b2ae3b3d
2021-01-07 18:48:00 +00:00
Treehugger Robot
4f430ae5ec Merge "Revert "Add service-connectivity to tethering APEX"" 2021-01-07 15:25:03 +00:00
Pete Bentley
850ca6f6b4 Revert "Add service-connectivity to tethering APEX"
Revert "Set setCurrentProxyScriptUrl as public"

Revert submission 1532910-connectivity_jar_in_apex

Reason for revert: Breaks boot tests: b/176969905
Reverted Changes:
Ie41a5b569:Set setCurrentProxyScriptUrl as public
Id7b6a4664:Move service-connectivity to the tethering APEX
Ia7cb83834:Add service-connectivity to tethering APEX

Change-Id: I9f31d4810a92e620f02cc8d24bdf18fe28001a2b
2021-01-07 13:51:18 +00:00
Lorenzo Colitti
4b2bf51ef9 Merge "Add service-connectivity to tethering APEX" am: 7998551cdc am: 3ebe8d0394
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1488520

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5f1f8a73b73277709568a79b623fa88f13b95179
2021-01-07 09:49:41 +00:00
Lorenzo Colitti
7998551cdc Merge "Add service-connectivity to tethering APEX" 2021-01-07 08:34:25 +00:00
Remi NGUYEN VAN
bd5cc4231d Add service-connectivity to tethering APEX
Add the connectivity service JAR to the tethering APEX.
This change should not be released in monthly updates until the
modularization work is done, so will be reverted in module release
branches.

Test: Boot, wifi connects and has internet access
Bug: 171540887
Merged-In: Ic496cd62be8c90928ccc619519ebe517beea78f0

Change-Id: Ia7cb83834b854e8c495c4ef17ec69ad032509208
2021-01-07 06:17:33 +00:00
Treehugger Robot
ee3f33ac41 Merge "Also update connected clients for local only tethering" am: 561f38a799 am: 1b1c4adab5 am: 8e1e05ec1e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1531561

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1bb18875a8c458c0ac112c13a277d4e563e3d8ac
2020-12-23 12:49:59 +00:00
Treehugger Robot
8e1e05ec1e Merge "Also update connected clients for local only tethering" am: 561f38a799 am: 1b1c4adab5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1531561

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I04ef025ed537623511a3d346d4c59d6efb6bef3f
2020-12-23 12:31:53 +00:00
Treehugger Robot
561f38a799 Merge "Also update connected clients for local only tethering" 2020-12-23 11:36:34 +00:00