LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
75,913 Commits 2 Branches 0 Tags
89a23454e4fa09362321826e9dde23f32ba50d2c
Commit Graph

2891 Commits

Author SHA1 Message Date
Mark Chien
52fee67b99 Merge "Fix testPhysicalEthernet failure for physical ethernet device" am: 1a978c0300 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2514919

Change-Id: I3e105e53564e1c933d70ea6688029b12ecc84bdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-31 05:18:58 +00:00
Mark Chien
1a978c0300 Merge "Fix testPhysicalEthernet failure for physical ethernet device" 2023-03-31 04:48:33 +00:00
Mark
2040551d18 Fix testPhysicalEthernet failure for physical ethernet device 
Other virtual interface ethernet test cases stop ethernet tethering
by deleting the virtual interface. To disable ethernet tethering for
testPhysicalEthernet, call stopTethering explicitly.

Bug: 271380398
Test: atest EtherentTetheringTest
Change-Id: I19a73f63227bab6a60d57d38b17a20a3f3f6c1d4
 2023-03-30 09:16:47 +00:00
Treehugger Robot
a78dbcaa16 Merge "TetheringUtils jni - clazz type is jclass" am: ec93ad26a7 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2510235

Change-Id: I56f2481ae5d854a0133657566490fa002258f3a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 01:52:13 +00:00
Maciej Żenczykowski
a7e496f067 TetheringUtils jni - clazz type is jclass 
See: packages/modules/Connectivity/Tethering/src/com/android/networkstack/tethering/util/TetheringUtils.java

public static native void setupNaSocket(FileDescriptor fd) throws SocketException;
public static native void setupNsSocket(FileDescriptor fd) throws SocketException;
public static native void setupRaSocket(FileDescriptor fd, int ifIndex) throws SocketException;

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: If406a4e507da916f5691d0ae4bded14dd168bc72
 2023-03-27 22:41:09 +00:00
Remi NGUYEN VAN
02eee9aa5a Use current shims in service-connectivity 
Instead of NetworkStackApiStableShims, use NetworkStackApiCurrentShims
as this is a development branch.

Use java_defaults in the "merge conflicts expected" section, so that
module release branches can use the same defaults, but set it to
NetworkStackApiStableShims.

The shims are removed from FrameworksNetIntegrationTests, as they are
already available there through service-connectivity-pre-jarjar. Keeping
them as a dependency would make FrameworksNetIntegrationTests use both
Stable shims (directly) and Current shims
(through service-connectivity-pre-jarjar).

Bug: 266205506
Test: m
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:921290b49d109360aae5dc39effaa3b0e691f65a)
Merged-In: I88228152834a1c06830fb51e868fb8e3d8c47519

Change-Id: I88228152834a1c06830fb51e868fb8e3d8c47519
 2023-03-27 15:56:23 +09:00
Remi NGUYEN VAN
8ff46fc063 Use stable shims in service-connectivity 
Keep using NetworkStackApiStableShims as this is a module release
branch.

Use java_defaults in the "merge conflicts expected" section, so that
module release branches can use the same defaults, but set it to
NetworkStackApiStableShims.

The shims are removed from FrameworksNetIntegrationTests, as they are
already available there through service-connectivity-pre-jarjar. Keeping
them as a dependency would make FrameworksNetIntegrationTests use both
Stable shims (directly) and Current shims
(through service-connectivity-pre-jarjar).

Ignore-AOSP-First: this needs to be submitted separately in each branch,
                   with downstream branches first as there are merge
		   conflicts in Tethering/apex/Android.bp that cannot be
		   automerged.

Bug: 266205506
Test: m
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:921290b49d109360aae5dc39effaa3b0e691f65a)
Merged-In: I88228152834a1c06830fb51e868fb8e3d8c47519

Change-Id: I88228152834a1c06830fb51e868fb8e3d8c47519
 2023-03-27 15:39:30 +09:00
Chidera Olibie
bfe0445299 Merge "Fix symbol not found error for hidden apis used by MTS" am: 8d4702a1f0 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2505055

Change-Id: I2fd0071d0689db59fa81f29cddfe6fa6c6ea4b1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-24 08:24:42 +00:00
Chidera Olibie
5f44ed3e7e Fix symbol not found error for hidden apis used by MTS 
This fails to build on git_master when
depending on `sdk_version:module-current` and
`libs:["framework-tethering-pre-jarjar"].

AIUI, some builds use sdk prebuilts that have compiled out
some of the hidden apis. And thus fails with symbol not found.

So we depend on the impl version of frame-tethering so we always
have access to these hidden apis for MTS.

Test: atestNetHttpCoverageTests
Change-Id: Id68a9051b9f8566f9ca42142669150a6db8b0925
 2023-03-23 15:53:11 +00:00
Mohannad Farrag
45d81bf4dc Revert^2 "gn2bp: Remove soong_namespace" am: 9c6801f81b 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2505960

Change-Id: I0572cf0b1ceb56ef1a2186d73c17ecfac0e9b3ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 15:42:10 +00:00
Mohannad Farrag
f6c6d27601 Revert "gn2bp: Remove soong_namespace" am: 8484ec4dcd 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2505958

Change-Id: If94589a125c316679b5524240446596ff88b6328
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 12:53:53 +00:00
Mohannad Farrag
02790d8b53 gn2bp: Remove soong_namespace am: 16ba062336 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2502135

Change-Id: Ic75283ac1d606d3e9305822b729e7791497a0588
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 12:53:33 +00:00
Mohannad Farrag
9c6801f81b Revert^2 "gn2bp: Remove soong_namespace" 
8484ec4dcd

Change-Id: I490c09179ea6a20ca5fba83c314b552d360be688
 2023-03-23 12:47:47 +00:00
Mohannad Farrag
8484ec4dcd Revert "gn2bp: Remove soong_namespace" 
Revert submission 2502135-remove_soong_namespace

Reason for revert: Missing line needs to be added

Reverted changes: /q/submissionid:2502135-remove_soong_namespace

Change-Id: I780a21cf7031e04eb368fda4f93ed16ea032ca8d
 2023-03-23 12:36:48 +00:00
Mohannad Farrag
16ba062336 gn2bp: Remove soong_namespace 
* This was causing the infra to ignore the modules and masking build errors.

Test: TH
Change-Id: Ic5aa3557353488d5370f4d9c4240954820bfe52b
 2023-03-23 12:14:04 +00:00
Wayne Ma
ac925c2b0e Merge "Add new test for swtiching multiple upstream network." am: cd893e0825 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2498797

Change-Id: I6781dc939024b551374cf220c75621454c003163
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 09:26:50 +00:00
Wayne Ma
cd893e0825 Merge "Add new test for swtiching multiple upstream network." 2023-03-21 08:51:42 +00:00
Wayne Ma
2bcd523745 Add new test for swtiching multiple upstream network. 
Bug: 263681262
Test: atest TetheringMetricsTest
Change-Id: I70e88d36ecf4cac0f61ab54cc14efa46a4b5facb
 2023-03-21 11:38:16 +08:00
Wayne Ma
eb92d35201 Merge "Implement logging of upstream event type and duration." am: 9d6b724887 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2335004

Change-Id: I19a94c3baa80d184f50a1d436afd8f558068b7c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 17:23:36 +00:00
Wayne Ma
9d6b724887 Merge "Implement logging of upstream event type and duration." 2023-03-20 16:50:37 +00:00
Stefano Duo
a5e1029101 Merge "Reland "Bundle Cronet's boringssl"" 2023-03-20 13:10:30 +00:00
Stefano Duo
ea2617fd91 Merge "Reland "Bundle Cronet's boringssl"" into tm-mainline-prod 2023-03-20 10:16:42 +00:00
KH Shi
4f84b2594e Merge "Add Tetheroffload AIDL interface support" am: 7b8568927e 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2372828

Change-Id: Iee59d12731d4a4b161806cdebf676d3286ab0dc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 04:30:44 +00:00
KH Shi
7b8568927e Merge "Add Tetheroffload AIDL interface support" 2023-03-20 03:58:42 +00:00
Motomu Utsumi
ef03027e61 Merge "cronet: Update APIs naming" am: f4ea712ce4 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2495437

Change-Id: Idf379603363c71ee5e8240b4cbfd1948cf1a5431
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-17 15:18:24 +00:00
Motomu Utsumi
f4ea712ce4 Merge "cronet: Update APIs naming" 2023-03-17 14:41:51 +00:00
Stefano Duo
43d89f659f Reland "Bundle Cronet's boringssl" 
This relands commit 2cd4ac8725

Merged-In: I903369dbad37b663a39e80149e25b0634386df6d
Change-Id: I018121bf4d02ccc59c89de39e3d1598deb9cf67b
Bug: 274094720
 2023-03-17 13:46:25 +00:00
Stefano Duo
9f940b7bf5 Reland "Bundle Cronet's boringssl" 
This relands commit 2cd4ac8725

Merged-In: Iee63b9f53866d1f44440fed1e632549dd6b296f9
Change-Id: I903369dbad37b663a39e80149e25b0634386df6d
Bug: 274094720
 2023-03-17 13:44:21 +00:00
Patrick Rohr
4bb5d3edc6 Connectivity Tests: join handler thread after calling quitSafely am: 98021b650b 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2485661

Change-Id: I7d642e99202abdc80ee0dc4d84106ce09d2a7726
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-17 11:20:53 +00:00
Motomu Utsumi
2441e4aea6 cronet: Update APIs naming 
Bug: 265674359
Bug: 273937039
Test: TH
Change-Id: I5fc149396511effdfabd462eba80d1a010ee205a
 2023-03-17 09:04:56 +00:00
KH Shi
3d5e65cb48 Add Tetheroffload AIDL interface support 
Add the AIDL HAL service interface support and abstract the HIDL/AIDL
interface implementations to allow OffloadController to talk to both
interfaces.

Bug: b/205762647
Test: atest com.android.networkstack.tethering
      atest ConnectivityCoverageTests
      atest ConntrackSocketTest
Change-Id: If7634a298d03668ed70b328f1ad6ca0ac0fe170b
 2023-03-17 16:56:47 +08:00
Wayne Ma
c0e9e2901b Implement logging of upstream event type and duration. 
Bug: 263681262
Test: atest TetheringMetricsTest
Test: statsd_testdrive 303
Change-Id: I80301ee035a9814920e3ce4b9eca6bcdc59350db
 2023-03-17 16:40:06 +08:00
Patrick Rohr
98021b650b Connectivity Tests: join handler thread after calling quitSafely 
Somewhat surprisingly, HandlerThread#quitSafely is *not* a synchronous
method, so the tearDown() method still needs to wait for the thread to
join.

Test: TH
Change-Id: I0433e2100adf9299a67af5c259a518cf44f4be57
 2023-03-17 01:01:09 -07:00
Dan Stahr
35e1256321 Merge "cronet: Fix AutoBoxing API linter issue" am: 9ed7a339a1 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2487297

Change-Id: Ic8b1bd9de78e5eedca3cb801310107d8375ece14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 15:34:31 +00:00
Dan Stahr
9ed7a339a1 Merge "cronet: Fix AutoBoxing API linter issue" 2023-03-16 15:03:55 +00:00
Anton Hansson
2b246a30df Merge "Use filegroup defaults for framework sources" am: 41ad986490 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2489555

Change-Id: Ib228177586d24d210a1abf808af2557d929141c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-16 09:27:51 +00:00
Anton Hansson
41ad986490 Merge "Use filegroup defaults for framework sources" 2023-03-16 08:46:34 +00:00
Motomu Utsumi
5cdd07aa26 cronet: Fix AutoBoxing API linter issue 
Bug: 265674359
Test: TH
Change-Id: Id2489a2337ff4d0fd0c30929f9e56d8d027dbbc6
 2023-03-15 13:54:17 +00:00
Wayne Ma
ac9647df3a Merge "Refactor TetheringMetricsTest, remove Pair." am: 812cd0fcc1 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2489118

Change-Id: Id0b73a631d631fe2fc58fb7d4be3388055953011
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 12:15:14 +00:00
Anton Hansson
57f3d69fd5 Use filegroup defaults for framework sources 
There's now a shared defaults module for this kind of filegroup. Use
that and remove the previously duplicated prop.

Bug: 271816210
Test: m
Change-Id: Ia4547984a73179fdfc98c427482dd10246f9722c
 2023-03-15 10:36:52 +00:00
Wayne Ma
304e4f2af8 Refactor TetheringMetricsTest, remove Pair. 
Test: atest TetheringMetricsTest
Change-Id: I1b536ff198119b07e9313f081a8e02e515c67efd
 2023-03-15 17:34:12 +08:00
Treehugger Robot
3f7bd80351 Merge "Revert "Bundle Cronet's boringssl"" am: 853ef56fb6 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2487884

Change-Id: I9e7867451e0275a36752da2e6b5bd2878926c6bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-15 00:58:22 +00:00
Treehugger Robot
853ef56fb6 Merge "Revert "Bundle Cronet's boringssl"" 2023-03-15 00:31:21 +00:00
Maciej Żenczykowski
15f747d730 Merge "EthernetTetheringTest: join handler thread after calling quitSafely" am: 78fd43ec67 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2485639

Change-Id: I1b23eab7538c44b08ef15fc843a9afbcadeba97c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 23:20:19 +00:00
Patrick Rohr
77c084d1f6 Revert "Bundle Cronet's boringssl" 
This reverts commit 2cd4ac8725.

Reason for revert: b/273575026

Change-Id: I5b9886465b8a0f71af469d303a39f670a9b0cb68
 2023-03-14 22:45:06 +00:00
Patrick Rohr
68454864fc EthernetTetheringTest: join handler thread after calling quitSafely 
Somewhat surprisingly, HandlerThread#quitSafely is *not* a synchronous
method, so the tearDown() method still needs to wait for the thread to
join.

Test: TH
Change-Id: I4297ba057b3d4e67c7b462b6995da637f2479d42
 2023-03-14 20:24:01 +00:00
Treehugger Robot
c3cdcf4fff Merge "Cronet API: make UrlRequest.Callback an interface." am: 944d6a3235 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2482136

Change-Id: I6de8a4e03395c21634f6db17458dbcb6ffeaa912
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 16:17:37 +00:00
Treehugger Robot
944d6a3235 Merge "Cronet API: make UrlRequest.Callback an interface." 2023-03-14 15:42:28 +00:00
Wayne Ma
fae6532265 Merge "Refactor TetheringMetricsTest" am: e18edffe3d 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2486935

Change-Id: I92cbcce2df5b3655676cfbb96ab280ffd8d1ceb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 09:00:09 +00:00
Wayne Ma
e18edffe3d Merge "Refactor TetheringMetricsTest" 2023-03-14 08:51:16 +00:00