LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
67,060 Commits 2 Branches 0 Tags
d0c03cf20f61bbdf461b33b10bf402e780bdf29a
Commit Graph

1320 Commits

Author SHA1 Message Date
Maciej Żenczykowski
fee07b3477 Merge changes Ic18521b6,Ibede8137 am: a1b3378285 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2164423

Change-Id: Ib68efa04044d123b4fdccbfa65f38a1f38896864
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-26 09:08:06 +00:00
Maciej Żenczykowski
a1b3378285 Merge changes Ic18521b6,Ibede8137 
* changes:
  Move tag/untag socket BPF map access from JNI to Java
  Move struct CookieTagMap{Key, Value} to Connectivity/common
 2022-07-26 08:35:58 +00:00
Aaron Huang
059a7f9526 Merge "Migrate buildTemplate* to use NetworkTemplate.Builder" am: c37d806dfd 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2152658

Change-Id: If75f307a6e46677cfc1932d8f968226729819ba1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-26 07:58:23 +00:00
Aaron Huang
c37d806dfd Merge "Migrate buildTemplate* to use NetworkTemplate.Builder" 2022-07-26 07:40:49 +00:00
Treehugger Robot
07ec1ed8fb Merge "Changing EthernetNetworkFactoryTest assert order" am: c34c21c624 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2163529

Change-Id: If8e5a3eb0133fa19b71ea5606a6a47d3d4c4a087
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-25 22:49:48 +00:00
James Mattis
fce2777a9b Changing EthernetNetworkFactoryTest assert order 
Changing multiple instances where the assert order for an assert.equals
was (actual, expected) to the more widely (and suggested) ordering of
(expected, actual).

Bug: 235605892
Test: atest FrameworksNetTests
:com.android.server.ethernet.EthernetNetworkFactoryTest

Change-Id: I6e9459d34d6cc7f43a2bfe346d2c2ca9551d46da
 2022-07-25 12:36:49 -07:00
Aaron Huang
1c14fa9b08 Migrate buildTemplate* to use NetworkTemplate.Builder 
Use new Builder API which was introduced in Android T.

Bug: 238843364
Test: FrameworksNetTests
      dumpsys netstats --checkin and check the output
Change-Id: Ieb0a2ee04056a1cedb71274ea710ff5153e2d68c
 2022-07-25 11:30:13 +08:00
Hungming Chen
913507f150 Move tag/untag socket BPF map access from JNI to Java 
Tag socket as uid AID_CLAT to avoid duplicated data usage counting by
bpf program.

Bug: 237369591
Test: ClatCoordinatorTest
Change-Id: Ic18521b63b3feadd53d77d7f4f0b44ab983e5fbf
 2022-07-23 03:19:13 +08:00
Hungming Chen
ef0280288e Move struct CookieTagMap{Key, Value} to Connectivity/common 
Need to share struct CookieTagMap{Key, Value} with:
service/src/com/android/server/connectivity/ClatCoordinator.java
service-t/src/com/android/server/net/NetworkStatsService.java
tests/unit/java/com/android/server/connectivity/ClatCoordinatorTest.java
tests/unit/java/com/android/server/net/NetworkStatsServiceTest.java

These files only have different package name as expected.

$ diff common/src/com/android/net/module/util/bpf/CookieTagMapKey.java service-t/src/com/android/server/net/CookieTagMapKey.java
  17c17
  <- package com.android.net.module.util.bpf;
  ---
  -> package com.android.server.net;

$ diff common/src/com/android/net/module/util/bpf/CookieTagMapValue.java service-t/src/com/android/server/net/CookieTagMapValue.java
  17c17
  <- package com.android.net.module.util.bpf;
  ---
  -> package com.android.server.net;

Bug: 237369591
Test: atest ConnectivityCoverageTests
Change-Id: Ibede81376382f0dd7a032c8c988dd84c7422eece
 2022-07-23 03:18:55 +08:00
Patrick Rohr
0978a2194d Merge changes If13254d4,I2424bd4f am: df9fbd37c6 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2159680

Change-Id: I2a71dc408a82aa13db133e91129f2af85d0a6224
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-22 15:03:11 +00:00
Patrick Rohr
df9fbd37c6 Merge changes If13254d4,I2424bd4f 
* changes:
  Sendcallback when setting eth interface up
  ethernet: add test for enable/disable interface
 2022-07-22 14:44:34 +00:00
James Mattis
a199735a88 Sendcallback when setting eth interface up 
Fix so callbacks are sent when changing the interface link state for an
ethernet interface from down -> up.

Bug: 235605892
Test: atest FrameworksNetTests
:com.android.server.ethernet.EthernetNetworkFactoryTest

Change-Id: If13254d4882aa2f0021f6443f31ef173b3867727
 2022-07-21 21:39:52 -07:00
Paul Hu
7c87930abe Merge "Add more NsdService tests" am: 9c8cda2335 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2129000

Change-Id: Id31fe3724adb899f54f64ca72685df8d4dd93a07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-22 01:53:17 +00:00
Paul Hu
9c8cda2335 Merge "Add more NsdService tests" 2022-07-22 01:40:30 +00:00
Lucas Lin
3b1f319294 Merge "Test if VpnManager event will be sent to Settings VPN or not" am: 95f801a104 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2160462

Change-Id: I5c918bdaab9d9ae8e9dd9caa2ac23c168fe9abc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-21 22:20:16 +00:00
Lucas Lin
95f801a104 Merge "Test if VpnManager event will be sent to Settings VPN or not" 2022-07-21 11:05:42 +00:00
lucaslin
6baebebbe1 Test if VpnManager event will be sent to Settings VPN or not 
Bug: 236315805
Test: atest FrameworksNetTests:VpnTest
Change-Id: I0ee4a70ded4937a1573d34cddab552f762e4fc18
 2022-07-21 00:58:38 +00:00
Lucas Lin
90b955f0be Merge "Test if VPN app can grant ACTIVATE_PLATFORM_VPN with CONTROL_VPN" am: 4887b5f98f 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2141573

Change-Id: Ibfa9421004521ab86f33097cd54bdb492964a241
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 13:36:05 +00:00
Lucas Lin
4887b5f98f Merge "Test if VPN app can grant ACTIVATE_PLATFORM_VPN with CONTROL_VPN" 2022-07-20 13:28:43 +00:00
Paul Hu
64f36446c7 Add more NsdService tests 
This is a no-op and test only change. Test the scenarios below:
- Registration service successful and failed.
- Discovery service failed.
- Resolution service failed.
- Getting an address failed.

Bug: 236788977
Test: atest FrameworksNetTests
Change-Id: I533d0be2abfa5c1832a060b4b2d4d1dd382c5b71
 2022-07-20 10:11:18 +00:00
Aaron Huang
be198dcc5c Merge "Replace buildTemplate* with NetworkTemplate.Builder" am: 1ba1febf2b 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2155326

Change-Id: I0837739ae0b1d8daadbbd2311a6c65eb61c139f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 03:13:07 +00:00
Aaron Huang
1ba1febf2b Merge "Replace buildTemplate* with NetworkTemplate.Builder" 2022-07-20 02:56:33 +00:00
Patrick Rohr
9baf09483f Merge "ethernet: fix receiving NetworkOffer callbacks on stale object" am: b916ff898b 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2150733

Change-Id: I435577bd8ac42a0adcdbbb76d35d4d00ecf3a3c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-18 16:07:53 +00:00
Patrick Rohr
b916ff898b Merge "ethernet: fix receiving NetworkOffer callbacks on stale object" 2022-07-18 15:50:14 +00:00
Aaron Huang
a4fcb8b4cf Replace buildTemplate* with NetworkTemplate.Builder 
Use Builder API which was provided in Android T to
build a template.

Bug: 238843364
Test: build, FrameworksNetTests:NetworkStatsManagerTest
Change-Id: Ibf1ac16541d6f3ddaf9b241e2f47ae04acbedf93
 2022-07-18 17:16:49 +08:00
Patrick Rohr
7c4e2a918c ethernet: fix receiving NetworkOffer callbacks on stale object 
unregisterNetworkOffer() does not execute synchronously, so it is
possible that NetworkOffer callbacks are received after the offer was
unregistered.

Test: atest EthernetManagerTest && atest EthernetNetworkFactoryTest
Bug: 171872016
Change-Id: I2c50b01176e4968c31f83148f1831b55f8b06908
 2022-07-15 10:32:25 -07:00
Motomu Utsumi
49cde8cb1a Merge "Use java BpfMap in BpfNetMaps#setUidRule" am: fe72021c06 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2145583

Change-Id: Ie51d1acd1aeea98ea74a5acce5319c848dacef2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 01:28:29 +00:00
Motomu Utsumi
fe72021c06 Merge "Use java BpfMap in BpfNetMaps#setUidRule" 2022-07-15 01:06:48 +00:00
Paul Hu
5431ee443e Merge "Add common parameters to reduce duplicated code" am: 0ce40ac75d 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2127695

Change-Id: I44164044e04dd881db66e54beff68883398d2a5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-14 08:11:56 +00:00
Paul Hu
0ce40ac75d Merge "Add common parameters to reduce duplicated code" 2022-07-14 08:00:16 +00:00
Paul Hu
601644c8a7 Add common parameters to reduce duplicated code 
This is a no-op and test only change. Some parameters use many
times, so add common parameters to reduce duplicated code.

Bug: 236788977
Test: atest FrameworksNetTests
Change-Id: I94370817ea87d1da5c30ea2ed467c1746edecba3
 2022-07-14 02:21:41 +00:00
Motomu Utsumi
40230beb5f Use java BpfMap in BpfNetMaps#setUidRule 
Bug: 217624062
Test: atest BpfNetMapsTest
android.net.cts.ConnectivityManagerTest#testFirewallBlocking

Change-Id: I79745231edac77d07571fa1909da5b9e811a69c4
 2022-07-14 02:12:34 +00:00
Motomu Utsumi
96851244dc Use java BpfMap in removeUidInterfaceRules am: 599c4e5cf4 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2141539

Change-Id: I2a5cef59730736250f1556eb59791b1bbc538803
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-14 01:50:43 +00:00
Motomu Utsumi
832056dd7f Use java BpfMap in BpfNetMaps#addUidInterfaceRules am: 5f52f4f2fb 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2141538

Change-Id: Iebb5ec487c7f16225048636978f517ab0e4de821
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-14 01:50:40 +00:00
Motomu Utsumi
599c4e5cf4 Use java BpfMap in removeUidInterfaceRules 
Bug: 217624062
Test: atest BpfNetMapsTest HostsideVpnTests#testBlockIncomingPacket
Change-Id: I253c75aaeabe138a4f9d57c226744f5766ef1006
 2022-07-13 11:12:19 +00:00
Motomu Utsumi
5f52f4f2fb Use java BpfMap in BpfNetMaps#addUidInterfaceRules 
Bug: 217624062
Test: atest BpfNetMapsTest HostsideVpnTests#testBlockIncomingPacket
Change-Id: I8aeb4712c852167d553eb331f32d770582199b13
 2022-07-13 11:11:59 +00:00
Motomu Utsumi
a3fb4620dd Merge changes I58cd6145,I32299ce8,I0433459e am: fabb53a881 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2141537

Change-Id: Id20441fd2fc3ffa15dc3325bf1e95ce9b82d51b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-12 03:30:48 +00:00
Motomu Utsumi
fabb53a881 Merge changes I58cd6145,I32299ce8,I0433459e 
* changes:
  Use java BpfMap in updateUidLockdownRule
  Use java BpfMap in BpfNetMaps#addNiceApp
  Use java BpfMap in BpfNetMaps#removeNiceApp
 2022-07-12 03:00:28 +00:00
Motomu Utsumi
31e985a4c2 Merge changes I69a2970d,Ibfb3ae48,Ie595cf1f am: 9ab777b5d5 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2138295

Change-Id: If58e9b76e8b722d471597fb8a7007300fdfe4f35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-11 07:33:31 +00:00
Motomu Utsumi
697b299e3a Use java BpfMap in updateUidLockdownRule 
Bug: 217624062
Test: atest BpfNetMapsTest HostsideVpnTests#testBlockIncomingPacket
Change-Id: I58cd614575a98c4b5a8f9c34d47dd2dfff187b26
 2022-07-11 07:19:05 +00:00
Motomu Utsumi
9ab777b5d5 Merge changes I69a2970d,Ibfb3ae48,Ie595cf1f 
* changes:
  Use java BpfMap in BpfNetMaps#addNaughtyApp
  Use java BpfMap in BpfNetMaps#removeNaughtyApp
  Add bpf map and lock for UidOwnerMap
 2022-07-11 07:14:53 +00:00
Motomu Utsumi
c3f1a475c3 Merge "Update error handling in BpfNetMaps" am: f2eca2f13a 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2135063

Change-Id: I01a3b2942c68c6e7f91de5a6e8d249c601771bb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-11 06:49:45 +00:00
Motomu Utsumi
f2eca2f13a Merge "Update error handling in BpfNetMaps" 2022-07-11 06:28:50 +00:00
Motomu Utsumi
55630d0dc8 Use java BpfMap in BpfNetMaps#addNiceApp 
Bug: 217624062
Test: atest BpfNetMapsTest HostsideRestrictBackgroundNetworkTests
Change-Id: I32299ce8cde34d46999ecb966c3305c966c0509f
 2022-07-11 03:14:07 +00:00
Motomu Utsumi
389278ec8b Use java BpfMap in BpfNetMaps#addNaughtyApp 
Bug: 217624062
Test: atest BpfNetMapsTest HostsideRestrictBackgroundNetworkTests
Change-Id: I69a2970d20be41431b774273bc0902bd325421f4
 2022-07-11 03:14:07 +00:00
Motomu Utsumi
7392eb4f4c Use java BpfMap in BpfNetMaps#removeNiceApp 
Bug: 217624062
Test: atest BpfNetMapsTest HostsideRestrictBackgroundNetworkTests
Change-Id: I0433459ec43b6a84c4417152884d10fae5fecee6
 2022-07-11 03:14:07 +00:00
Motomu Utsumi
60ed3be43b Use java BpfMap in BpfNetMaps#removeNaughtyApp 
Bug: 217624062
Test: atest BpfNetMapsTest HostsideRestrictBackgroundNetworkTests
Change-Id: Ibfb3ae48427b7dc5d06708e63f4a16f7527ce86c
 2022-07-11 03:14:07 +00:00
Motomu Utsumi
5a68a21926 Add bpf map and lock for UidOwnerMap 
This commit is a preparation for replacing JNI codes that modify
UidOwnerMap by Java.

Bug: 217624062
Test: atest BpfNetMapsTest HostsideRestrictBackgroundNetworkTests
android.net.cts.ConnectivityManagerTest#testFirewallBlocking

Change-Id: Ie595cf1f77a3ed86addbcdaea1a1be972e0265b3
 2022-07-11 03:14:05 +00:00
Motomu Utsumi
305975ffb0 Update error handling in BpfNetMaps 
Address review comments from aosp/2117045
Throw AssertionError if bpf map init get error
Update tests to avoid getting AssertionError

Bug: 217624062
Test: atest BpfNetMapsTest
Change-Id: I2194b825aa73b88d5334077d17acb9abbd367c69
 2022-07-11 03:13:04 +00:00
Chiachang Wang
cda9c3e682 Merge "Verify calling thread for intent receiver" am: 11781f84b6 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2145587

Change-Id: I6200b112284b59051f4c5dfda347b0ccb81912f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-11 01:48:45 +00:00