Commit Graph

12059 Commits

Author SHA1 Message Date
Hungming Chen
8a480eebef Fix attaching program failure on kernel 5.10 am: 3c94994650 am: dc0ec70f3f am: 29f06c4478
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1697147

Change-Id: Ia770d7b85ff9650743d2825cbdff12f5c634630f
2021-05-06 08:17:26 +00:00
Hungming Chen
8097f6c9b2 Fix attaching program failure on kernel 5.10 am: 3c94994650 am: dc0ec70f3f am: fdd9f07e20
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1697147

Change-Id: I737e0b73011cae23417fe458473dca7d7b21277e
2021-05-06 08:10:38 +00:00
Hungming Chen
fdd9f07e20 Fix attaching program failure on kernel 5.10 am: 3c94994650 am: dc0ec70f3f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1697147

Change-Id: Ia8e6302907d0115f92cd1186ea626dd1115a131e
2021-05-06 07:30:44 +00:00
Hungming Chen
29f06c4478 Fix attaching program failure on kernel 5.10 am: 3c94994650 am: dc0ec70f3f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1697147

Change-Id: I639f84c8b4c92b3167b30f0e467a96d6e4500808
2021-05-06 07:28:46 +00:00
Hungming Chen
dc0ec70f3f Fix attaching program failure on kernel 5.10 am: 3c94994650
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1697147

Change-Id: I67cee508cb60f424b01c84fc729b892693905e95
2021-05-06 07:14:29 +00:00
Hungming Chen
3c94994650 Fix attaching program failure on kernel 5.10
Attach BPF program may be failed with the netlink error message
"Invalid argument". Per debug kernel trace, it is failed in
comparing the kind name in tc_new_tfilter.

Log:
05-05 19:44:42.329  1073  2332  2332 W tc_new_tfilter:
Specified filter kind does not match existing one

Test: enable usb tethering and check the follows

$ adb shell tc filter show dev <upstream, downstream> ingress
filter protocol ipv6 pref 1 bpf chain 0
filter protocol ipv6 pref 1 bpf chain 0 handle 0x1
prog_offload_schedcls_tether_upstream6_ether:[*fsobj]
direct-action not_in_hw id 3 tag 94ca9b12972fdea8
filter protocol ip pref 2 bpf chain 0
filter protocol ip pref 2 bpf chain 0 handle 0x1
prog_offload_schedcls_tether_upstream4_ether:[*fsobj]
direct-action not_in_hw id 9 tag 992aa9bfd0503457
filter protocol ipv6 pref 1 bpf chain 0
filter protocol ipv6 pref 1 bpf chain 0 handle 0x1
prog_offload_schedcls_tether_downstream6_rawip:[*fsobj]
direct-action not_in_hw id 4 tag 7fb60e556b8f3be7
filter protocol ip pref 2 bpf chain 0
filter protocol ip pref 2 bpf chain 0 handle 0x1
prog_offload_schedcls_tether_downstream4_rawip:[*fsobj]
direct-action not_in_hw id 6 tag e41426095404fb64

Change-Id: I471a2e34c626a3737cbd2754e4d1b3000bcf6ba6
2021-05-06 02:52:07 +00:00
Paul Hu
3040e81c8f Merge "Fix testSocketKeepaliveLimitTelephony on R" into sc-dev 2021-04-28 02:19:09 +00:00
Treehugger Robot
a5286902fd Merge "Add native coverage listener to tethering coverage test" am: e6bafe29b0 am: 1c4103c150 am: 9662233c70
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1687651

Change-Id: I570739b3b7f58aabb7856896b0f3f2e0c9f1967c
2021-04-27 19:51:49 +00:00
Treehugger Robot
b22fb6c09e Merge "Add native coverage listener to tethering coverage test" am: e6bafe29b0 am: 1c4103c150 am: 659bbf4f24
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1687651

Change-Id: Ifd9f54157ecc1d0f1a109dde05a12b2ef75e07e8
2021-04-27 19:50:31 +00:00
Treehugger Robot
659bbf4f24 Merge "Add native coverage listener to tethering coverage test" am: e6bafe29b0 am: 1c4103c150
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1687651

Change-Id: I2c5465f222c89f65de9fe42272f9ee4cfc971df5
2021-04-27 19:32:38 +00:00
Treehugger Robot
9662233c70 Merge "Add native coverage listener to tethering coverage test" am: e6bafe29b0 am: 1c4103c150
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1687651

Change-Id: Ib128e298c8b695438a562e5cbb092fd04c4746c2
2021-04-27 19:32:29 +00:00
Treehugger Robot
1c4103c150 Merge "Add native coverage listener to tethering coverage test" am: e6bafe29b0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1687651

Change-Id: I895dd9b7c2a9fdf1f9e9dae18e54a5fe635d954f
2021-04-27 19:08:11 +00:00
Sarah Chin
5ea0c2bd8d Merge "Add tests for NetCapability#getCapabilityCarrierName" am: 45fa6bd811 am: 4d9f226837 am: db1cde3f50
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1683350

Change-Id: I7575a22f8c0e96148263c51b4bccf22a363a9131
2021-04-27 19:01:32 +00:00
Sarah Chin
3fb5810dda Merge "Add tests for NetCapability#getCapabilityCarrierName" am: 45fa6bd811 am: 4d9f226837 am: 2200bcd2db
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1683350

Change-Id: Iabb48367287651d3a4ec6cac558587504883ff17
2021-04-27 18:55:32 +00:00
Sarah Chin
2200bcd2db Merge "Add tests for NetCapability#getCapabilityCarrierName" am: 45fa6bd811 am: 4d9f226837
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1683350

Change-Id: I7d74dc77ea69c68138c282af74f19dd67c38253f
2021-04-27 18:36:09 +00:00
Sarah Chin
db1cde3f50 Merge "Add tests for NetCapability#getCapabilityCarrierName" am: 45fa6bd811 am: 4d9f226837
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1683350

Change-Id: I306e0ba0bb52de4a408e21a26a81a327905c7d59
2021-04-27 18:35:59 +00:00
Treehugger Robot
e6bafe29b0 Merge "Add native coverage listener to tethering coverage test" 2021-04-27 18:35:29 +00:00
Sarah Chin
4d9f226837 Merge "Add tests for NetCapability#getCapabilityCarrierName" am: 45fa6bd811
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1683350

Change-Id: I90d74f4ec5f6b7bbe81862484f50fc7fb83ae134
2021-04-27 18:17:55 +00:00
Sarah Chin
45fa6bd811 Merge "Add tests for NetCapability#getCapabilityCarrierName" 2021-04-27 17:58:12 +00:00
markchien
b23e912805 Add native coverage listener to tethering coverage test
This allows the coverage tests to manually trigger native coverage
collection, as a workaround for collection not being triggered
automatically by the coverage infrastructure.

Bug: 185202279
Test: atest TetheringCoverageTests
Change-Id: I619fc267cf1743dd2218e3dd42546b0d4e9da193
2021-04-27 16:48:25 +00:00
Remi NGUYEN VAN
5798a37596 Fix testSocketKeepaliveLimitTelephony on R
DEVICE_INITIAL_SDK_INT does not exist in older SDKs: use the pre-rename
field, FIRST_SDK_INT instead.

Fixes: 185731191
Test: atest ConnectivityManagerTest#testSocketKeepaliveLimitTelephony
Ignore-AOSP-First: Needs cherry-picks

Change-Id: I1fbc0f714d539a664c053cb9cf1f86c3e651c5a2
2021-04-27 21:59:25 +09:00
Lucas Lin
5d1cfaf1c6 Merge "Define PRIVATE_DNS_MODE_OPPORTUNISTIC locally" into sc-dev 2021-04-27 06:03:14 +00:00
lucaslin
75ba4e7873 Define PRIVATE_DNS_MODE_OPPORTUNISTIC locally
The type of ConnectivityManager#PRIVATE_DNS_MODE_OPPORTUNISTIC
has changed from String to int, but the String definition is still
needed to update to Settings.Global.PRIVATE_DNS_MODE, so the
simplest way is to define one locally.

Bug: 185311744
Test: atest CtsNetTestCases
Change-Id: Iafcd861714d8aca44cede658ed630f9d5afd5e59
Ignore-AOSP-First: In the same TOPIC, there is a merge conflict in
DevicePolicyManagerService.java in the internal branch, so it's needed
to merge the code into internal branch to fix the merge conflict.
2021-04-26 07:34:24 +00:00
paulhu
90255ef0a7 Add ACCESS_NETWORK_STATE to Tethering CTS
Add ACCESS_NETWORK_STATE to Tethering CTS because tests call to
EthernetManager#isAvailable() which is enforcing permission check
now. Without ACCESS_NETWORK_STATE, some tests will fail by lack
of permission.

Bug: 174573778
Test: CtsTetheringTest
Change-Id: I735d98527c14c12fb0f2df536cda25fdd84152f1
Ignore-AOSP-First: Security vulnerability issue should not fix on
                   aosp branch.
2021-04-26 06:57:46 +00:00
Chiachang Wang
a9e718f59d [automerger skipped] Merge "Update APIs based on API review feedback" am: 5d4e9ee83d am: ccaf092fc0 am: 5dba5e229a -s ours
am skip reason: skip tag Change-Id Ie542e5ad631388d9948dd27de21bc218b5b5b8f2 with SHA-1 7f46cda1aa is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1679670

Change-Id: I9eccbeb23cbe93aff034093f99d66858874a8475
2021-04-26 01:34:33 +00:00
Chiachang Wang
69f9bea5a3 [automerger skipped] Merge "Update APIs based on API review feedback" am: 5d4e9ee83d am: ccaf092fc0 am: d4d930f937 -s ours
am skip reason: skip tag Change-Id Ie542e5ad631388d9948dd27de21bc218b5b5b8f2 with SHA-1 7f46cda1aa is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1679670

Change-Id: I3d887e625035d8385a183e6e0c2a3081e3b599eb
2021-04-26 01:33:18 +00:00
Chiachang Wang
5dba5e229a Merge "Update APIs based on API review feedback" am: 5d4e9ee83d am: ccaf092fc0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1679670

Change-Id: If730c3212ff938044fb1d7b04f57cca8df65dec2
2021-04-26 01:15:13 +00:00
Chiachang Wang
d4d930f937 Merge "Update APIs based on API review feedback" am: 5d4e9ee83d am: ccaf092fc0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1679670

Change-Id: Ifd55469fe2ea875345ce0b078e47ba5476310e9a
2021-04-26 01:13:03 +00:00
Chiachang Wang
ccaf092fc0 Merge "Update APIs based on API review feedback" am: 5d4e9ee83d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1679670

Change-Id: I3e2943633d520579dab8e2056fdd04e9e11448e1
2021-04-26 00:43:16 +00:00
Chiachang Wang
5d4e9ee83d Merge "Update APIs based on API review feedback" 2021-04-26 00:22:27 +00:00
Mark Chien
15d5f55256 Merge "Release mobile request when default upstream is not mobile" am: 07f8a618d2 am: d4b21984e9 am: 2827638c7e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1679667

Change-Id: Idba3789ec06464167ba40b181cf39a326e9e5086
2021-04-23 12:45:06 +00:00
Mark Chien
4534e88bc1 Merge "Release mobile request when default upstream is not mobile" am: 07f8a618d2 am: d4b21984e9 am: 81cb8cf02c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1679667

Change-Id: I2f5ee699fd85d5f3cad3331718a3c332a392ea67
2021-04-23 12:45:01 +00:00
Mark Chien
81cb8cf02c Merge "Release mobile request when default upstream is not mobile" am: 07f8a618d2 am: d4b21984e9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1679667

Change-Id: Id1a6fe30e93d175ba8e67bbafa05df7aa6e1f182
2021-04-23 12:23:23 +00:00
Mark Chien
2827638c7e Merge "Release mobile request when default upstream is not mobile" am: 07f8a618d2 am: d4b21984e9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1679667

Change-Id: I6fabfeed5609677c1f5045d66c344ad33f181669
2021-04-23 12:23:18 +00:00
Mark Chien
d4b21984e9 Merge "Release mobile request when default upstream is not mobile" am: 07f8a618d2
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1679667

Change-Id: Iaa11651f0d1a9d3850b45962231a7232e81f229d
2021-04-23 12:01:48 +00:00
Mark Chien
07f8a618d2 Merge "Release mobile request when default upstream is not mobile" 2021-04-23 11:48:36 +00:00
markchien
d5096f504d Release mobile request when default upstream is not mobile
Some OEM may have special mobile data icon show up when non-default
(e.g. DUN) mobile connection connected even wifi is also connected.
So always connected DUN may let user hard to distinguish tethering
upstream in those OEM's devices. Also release unused mobile connection
may safe power.

This CL removes unnecessary code from selectPreferredUpstreamType.
In particular:
    - When a DUN or HIPRI upstream is selected, calling
    registerMobileNetworkRequest is unnecessary. A mobile
    NetworkRequest is always registered unless a non-mobile upstream
    is selected.

    - When a non-mobile upstream is found, releasing the mobile
    NetworkRequest is unnecessary in selectPreferredUpstreamType
    because it will be done by chooseUpstreamType immediately after
    selectPreferredUpstreamType returns.

    - When no upstream is found and cellular upstream is not permitted,
    it is not necessary to release the mobile NetworkRequest. When
    cellular is not permitted, no such NetworkRequest will be filed
    because registerMobileNetworkRequest checks with EntitlementManager
    before actually requesting the network. If cellular becomes the
    upstream and then later becomes not permitted because of an
    entitlement failure, all tethering will be stopped by Settings.

Note: currently legacy upstream selection has two known bugs:
1. If mobile has higher priority than non-mobile network, mobile request
should never be released and always prefer use mobile. But in practice,
mobile request would be released when tethering select non-mobile network
as upstream.
2. If mobile has higher priority than wifi network and default network
is wifi but mobile is still connected, tethering would choose mobile as
upstream because it has higher priority. Mobile disconnecting may not
trigger tethering to switch its upstream to wifi because currnetly
tethering rely on CONNECTIVITY_ACTION broadcast to handle upstream
disconnect.

Bug: 173068192
Test: atest TetheringTests
Change-Id: Id5df58af830cc534ecd79041ddf8a04171047e9b
2021-04-23 16:45:29 +08:00
Chiachang Wang
878ad503a9 Update APIs based on API review feedback
Update the usage in callers side for
  - Rename NetworkAgent#setTeardownDelayMs to
    NetworkAgent#setTeardownDelayMillis
  - Use getters instead of fields in VpnTransportInfo
  - Rename registerDefaultNetworkCallbackAsUid to
    registerDefaultNetworkCallbackForUid in ConnectiivityManager

Bug: 183972850
Bug: 185246410
Fix: 184735863
Test: atest FrameworksNetTests
Test: atest CtsNetTestCasesLatestSdk
Change-Id: Ie542e5ad631388d9948dd27de21bc218b5b5b8f2
Merged-In: Ie542e5ad631388d9948dd27de21bc218b5b5b8f2
2021-04-23 02:44:07 +00:00
Chiachang Wang
67bc25eb33 Merge "Update doc in TestUtils" am: 8027d24eaf am: 3b5fd3154a am: 81fa7cc8d6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1684726

Change-Id: I197987806ba2f5e003dc939cffe2fb79eab5bfe3
2021-04-23 01:50:31 +00:00
Chiachang Wang
786749aa60 Merge "Update doc in TestUtils" am: 8027d24eaf am: 3b5fd3154a am: 6d7a9fa2cb
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1684726

Change-Id: I2d0dccdee44227d21c6af65f1f0d90081724d7b5
2021-04-23 01:40:03 +00:00
Chiachang Wang
6d7a9fa2cb Merge "Update doc in TestUtils" am: 8027d24eaf am: 3b5fd3154a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1684726

Change-Id: I09661d949feded17a1f1f45e660a66a73a0f1b2a
2021-04-23 01:18:10 +00:00
Chiachang Wang
81fa7cc8d6 Merge "Update doc in TestUtils" am: 8027d24eaf am: 3b5fd3154a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1684726

Change-Id: Ic43358e6d0670f07acc2a5ca6e79ba346f43675f
2021-04-23 01:17:58 +00:00
Chiachang Wang
3b5fd3154a Merge "Update doc in TestUtils" am: 8027d24eaf
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1684726

Change-Id: I33f2149be5c24bfbe269f2f25bcfc25d11da22be
2021-04-23 00:50:19 +00:00
Chiachang Wang
8027d24eaf Merge "Update doc in TestUtils" 2021-04-23 00:35:27 +00:00
Chiachang Wang
789811f267 Merge "Update APIs based on API review feedback" into sc-dev 2021-04-23 00:30:51 +00:00
Sarah Chin
bae0fb30f9 Add tests for NetCapability#getCapabilityCarrierName
Test: atest ConnectivityManagerTest
Fix: 183553812
Change-Id: I60801bb86302b57f6d72ea903d98a8249fae4555
2021-04-22 17:00:57 -07:00
Treehugger Robot
733780fd4b Merge "Fix testKeepaliveWifiUnsupported failure" am: 3b55c68cc2 am: c856c57a92 am: 455ef41ef5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1684429

Change-Id: I1e5d2eafc493b165cb816ccdd6f1b9bb733a3aa3
2021-04-22 15:55:13 +00:00
Treehugger Robot
c041940b5c Merge "Fix testKeepaliveWifiUnsupported failure" am: 3b55c68cc2 am: c856c57a92 am: 367e8bdc75
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1684429

Change-Id: I0b12536f2247c8d360506a6cae3891148a1a5197
2021-04-22 15:54:16 +00:00
Treehugger Robot
367e8bdc75 Merge "Fix testKeepaliveWifiUnsupported failure" am: 3b55c68cc2 am: c856c57a92
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1684429

Change-Id: I3d81d13647a923c3c37121bc99d5238b14d94e62
2021-04-22 15:34:04 +00:00
Treehugger Robot
455ef41ef5 Merge "Fix testKeepaliveWifiUnsupported failure" am: 3b55c68cc2 am: c856c57a92
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1684429

Change-Id: If346d0f024f4854a7d165c3f72f035a25fb66c2b
2021-04-22 15:33:53 +00:00