Commit Graph

1250 Commits

Author SHA1 Message Date
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
markchien
f50f05ebcb Also update connected clients for local only tethering
mForwardedDownstreams is the set of downstreams who wanted upstream.
In other word, it don't contains localOnly tethering(e.g. local only
hotspot, wifi p2p tethering). Changing the list from mForwardedDownstreams
to mNotifyList make both tethered and localOnly tethering have connected
clients callback.

Bug: 172290164
Test: atest TetheringTests
Change-Id: I58fdb28efc616b00d63a1c237ea93aee4d8f2dcd
2020-12-22 23:23:09 +08:00
Chalard Jean
f0c1648742 Merge "Move module utils to the module package." am: fab11bb263 am: e3db31f347
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1531558

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0d9c29e041caba754e4cb72167678234707484d3
2020-12-21 06:33:30 +00:00
Chalard Jean
d2df5729f6 Move module utils to the module package.
Test: FrameworksWifiTest FrameworksNetTest
Merged-In: Ib04bebb061dc64d6d685116b596fb3179d5b959a
Change-Id: I9118da3898d864c7bf0ed7bc9d94b94343c4a084
2020-12-16 11:44:34 +09:00
Orion Hodson
d4763bc919 Merge "Use libnetjniutils for JNI File Descriptor info" am: b5e3c63b72 am: 25bb834e23 am: 136538db89
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1519500

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ied073b067a19ea20f6a2206b43d37446145371d0
2020-12-15 08:11:23 +00:00
Orion Hodson
136538db89 Merge "Use libnetjniutils for JNI File Descriptor info" am: b5e3c63b72 am: 25bb834e23
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1519500

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I39de6d056c4ab4d2e44171069a5c2575f2b71376
2020-12-15 07:24:46 +00:00
Orion Hodson
e5bd0dba21 Use libnetjniutils for JNI File Descriptor info
Drops use of deprecated API in libnativehelper and uses a common
helper that will be stable across releases.

Bug: 158749603
Test: m
Change-Id: Ic1a1811ffb9a1c207f562a180417e99df31e3502
2020-12-11 22:48:10 +00:00
paulhu
b2c0185da4 Fix tethering doesn't turn off issue am: 862c8a1ea0 am: cd34630e6b am: 1b62a26c1a am: c7884164c6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1484019

Change-Id: I896b23cf0e7d622d6814940656cd72a17f591a22
2020-11-10 16:40:27 +00:00
paulhu
1b62a26c1a Fix tethering doesn't turn off issue am: 862c8a1ea0 am: cd34630e6b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1484019

Change-Id: I8f1417a1317acf18fe0d8a133fb83c095e14f8c1
2020-11-10 15:35:23 +00:00
paulhu
862c8a1ea0 Fix tethering doesn't turn off issue
When user restriction turns on, all tethering functions should
be disabled. But tethering functions still work after
restrication is on. Because tethering request would be removed
from mActiveTetheringRequests after starting tethering that
will result in Tethering#isTetheringActive() always returns
false. Thus, update the design to check tethered interface to
ensure that any of tethering function is working.

Bug: 169596583
Test: atest TetheringTests
Test: Manually test that tethering function would be disabled
      and notification would show to user after restriction
      was on.
Change-Id: Icb9649a5ecdec2d029ac763b5b9b80042ad50eb9
2020-11-10 16:47:52 +08:00
Mark Chien
38d781ae57 Merge "Fix null DadProxy failure in R Tethering unit test" am: 220e7854bd am: 668adf955c am: 8b3c07d951 am: a6bb7e3340
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1485808

Change-Id: I351e5dc3afaf61e5cf82913872ec0bec1e99a094
2020-11-09 06:53:04 +00:00
Nikita Ioffe
b6313e4e2c Merge "com.android.tethering: set min_sdk_version 30" am: 06bf173b20 am: b2bfb81567
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1489717

Change-Id: I8ff9ecaa92dbbf39659211b05ef9469c25909e12
2020-11-09 06:06:37 +00:00
Mark Chien
8b3c07d951 Merge "Fix null DadProxy failure in R Tethering unit test" am: 220e7854bd am: 668adf955c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1485808

Change-Id: I3f1d7019f1a12647b78630a412df3adf03e9e95a
2020-11-09 06:06:24 +00:00
Nikita Ioffe
06bf173b20 Merge "com.android.tethering: set min_sdk_version 30" 2020-11-06 12:46:39 +00:00
Mark Chien
220e7854bd Merge "Fix null DadProxy failure in R Tethering unit test" 2020-11-06 11:00:19 +00:00
Nikita Ioffe
583e35a12e com.android.tethering: set min_sdk_version 30
Tethering is updatable apex module that was launched in R, hence it and
all it dependencies should specify min_sdk_version <= 30.

Test: m
Bug: 171668006
Bug: 171330443
Change-Id: Ic91cf96dda6419d1038b0329b920f9cd24482aef
Merged-In: Ic91cf96dda6419d1038b0329b920f9cd24482aef
(cherry picked from commit bee20e84f8)
(cherry picked from commit 1fe1e539e1)
2020-11-05 20:30:40 +00:00
markchien
290e7c452b Fix null DadProxy failure in R Tethering unit test
Tethering unit test would verify the interfaction between DadProxy and
IpServer. Since DadProxy only available in S+, the test would fail if it
build with R sdk.

Bug: 171936270
Test: atest TetheringTests in both R and S
Change-Id: Ia73d4aa59d01400d1ccfd3fdc1b721e269cae952
2020-11-05 15:28:56 +08:00
Chalard Jean
7f65953491 Move module utils to the module package.
Test: FrameworksWifiTest FrameworksNetTest
Change-Id: Ib04bebb061dc64d6d685116b596fb3179d5b959a
2020-11-05 06:39:05 +00:00
Baligh Uddin
2cceb27a4c Revert "Add OWNERS block to prevent the tree from mooving during migration." am: 6554b75697 am: 7cb46422b1 am: b94226a63c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/12991879

Change-Id: I77f4b9f2b6f71b3be982639369bf292d614e1e1f
2020-11-05 05:04:14 +00:00
Baligh Uddin
7cb46422b1 Revert "Add OWNERS block to prevent the tree from mooving during migration." am: 6554b75697
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/12991879

Change-Id: I8bffe476b7aa462e43238d9df182280976b79712
2020-11-05 04:08:28 +00:00
Baligh Uddin
6554b75697 Revert "Add OWNERS block to prevent the tree from mooving during migration."
Migration of frameworks/base/packages/Tethering is complete, removing
the OWNERS block.
This reverts commit 1623eb61d5.
BUG: 167962976
Test: TH

Change-Id: Ic89c084604788b4d41cf854e5015c8ce7791c64d
2020-11-05 03:16:29 +00:00
Baligh Uddin
5329d7ef43 Add visibility rules for cts migration am: 661ae3923d am: c2ca22b5a9 am: 4a74a0788b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/12984519

Change-Id: Ifeda005dab54b3f5ec2ee1466e3b5ffc26407e1a
2020-11-04 10:30:39 +00:00
Baligh Uddin
c2ca22b5a9 Add visibility rules for cts migration am: 661ae3923d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/12984519

Change-Id: Ia8a1b074496bd7c5b4c127fe8dc476d54f63d414
2020-11-04 10:06:12 +00:00
Baligh Uddin
661ae3923d Add visibility rules for cts migration
BUG: 167962976
Test: TH
Change-Id: I96b34517e164789c9fa3b8fd7fb33fdd7a2a9166
2020-11-04 05:59:46 +00:00
Baligh Uddin
ebff93159e Adjust visibility for tests
BUG: 167962976
Test: TH
Merged-In: Ic89c084604788b4d41cf854e5015c8ce7791c64d
Change-Id: I12e326167c6fb61a59a919cdd0198ac8f8c84772
2020-11-04 05:06:58 +00:00