Commit Graph

11194 Commits

Author SHA1 Message Date
Sudheer Shanka
2432bdfa92 [automerger skipped] Update meteredness of cellular networks for tests. am: 8247993e00 am: 0ae458ce93 am: 9e007eab35 -s ours
am skip reason: Change-Id Id70856dffc920e74bda28583dba4dd851a832397 with SHA-1 9e441af03a is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1cc9bb947e669a0350540b96ffe055580cd52c4b
2021-02-08 06:33:04 +00:00
Sudheer Shanka
9e007eab35 Update meteredness of cellular networks for tests. am: 8247993e00 am: 0ae458ce93
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1538984

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I906ebb4a34aff51355bdd91895aab7ac790ffb5c
2021-02-08 05:57:40 +00:00
Sudheer Shanka
0ae458ce93 Update meteredness of cellular networks for tests. am: 8247993e00
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1538984

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3880ff751623a7c51c80ece150666d2e68945396
2021-02-08 05:18:44 +00:00
Sudheer Shanka
8247993e00 Update meteredness of cellular networks for tests.
This would allow us to run both metered and unmetered networkpolicy
related tests when the device is on a cellular network.

Bug: 165343126
Test: atest CtsHostsideNetworkTests:HostsideRestrictBackgroundNetworkTests
Test: atest CtsHostsideNetworkTests:HostsideNetworkCallbackTests
Change-Id: Id70856dffc920e74bda28583dba4dd851a832397
Merged-In: Id70856dffc920e74bda28583dba4dd851a832397
2021-02-07 23:29:08 +00:00
Sudheer Shanka
48cf7f07a4 Merge "Update meteredness of cellular networks for tests." into sc-dev 2021-02-07 19:08:50 +00:00
Martin Stjernholm
423a270abb Revert "Don't crash Tethering service when WiFi feature is missing" am: 199641d451 am: b329062b20 am: b9e5c3b247
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1575305

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I786ef0fee68b2e4310b45b63cd54286f8a168a3f
2021-02-05 15:50:01 +00:00
Martin Stjernholm
b9e5c3b247 Revert "Don't crash Tethering service when WiFi feature is missing" am: 199641d451 am: b329062b20
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1575305

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I56f5136bd9cc4f7527c3600b9a307bcd7ec9f33c
2021-02-05 15:01:25 +00:00
Martin Stjernholm
b329062b20 Revert "Don't crash Tethering service when WiFi feature is missing" am: 199641d451
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1575305

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id5c0fadf93627d48507660d4c54dc27c0d6047ae
2021-02-05 14:21:13 +00:00
Martin Stjernholm
199641d451 Revert "Don't crash Tethering service when WiFi feature is missing"
This reverts commit f6a1052f4e.

Reason for revert: Suspected reason for TetheringTests breakage
Bug: 179467044

Change-Id: I3a5ee621b32145b74a31d6c3e411bd789e395935
2021-02-05 11:47:48 +00:00
Sudheer Shanka
9e441af03a Update meteredness of cellular networks for tests.
This would allow us to run both metered and unmetered networkpolicy
related tests when the device is on a cellular network.

Bug: 165343126
Test: atest CtsHostsideNetworkTests:HostsideRestrictBackgroundNetworkTests
Test: atest CtsHostsideNetworkTests:HostsideNetworkCallbackTests
Ignore-AOSP-First: Handling merge-conflict
Change-Id: Id70856dffc920e74bda28583dba4dd851a832397
2021-02-05 07:11:23 +00:00
Tomasz Wasilczyk
dfb58b501b Don't crash Tethering service when WiFi feature is missing am: f6a1052f4e am: 75c7cb992a am: 86be613c85
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1559422

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib9aa310a0b58b466514c5c73485093dafaa6e883
2021-02-04 15:21:00 +00:00
Tomasz Wasilczyk
86be613c85 Don't crash Tethering service when WiFi feature is missing am: f6a1052f4e am: 75c7cb992a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1559422

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1a57e832b8c9700fce7b935bd5caf01b10eeb5ae
2021-02-04 15:02:56 +00:00
Tomasz Wasilczyk
75c7cb992a Don't crash Tethering service when WiFi feature is missing am: f6a1052f4e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1559422

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I638c438118b5749137d9c389e2cc6161b83d26af
2021-02-04 14:45:10 +00:00
Tomasz Wasilczyk
f6a1052f4e Don't crash Tethering service when WiFi feature is missing
Bug: 175430552
Test: disable WiFi feature on device with wlan0

Change-Id: I83012013ff6a276d9a5c70748b726289b007cb0a
2021-02-02 16:11:18 +00:00
Lucas Lin
f7a4835001 Merge "Add NetdStaticLibTestsLib into TetheringCoverageTests" am: c0bae3c8c5 am: 09193eba96 am: a4863a3491
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1552317

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I051cda3ccf5b2e5fa75392e75510603575420d99
2021-02-02 05:09:17 +00:00
Lucas Lin
a4863a3491 Merge "Add NetdStaticLibTestsLib into TetheringCoverageTests" am: c0bae3c8c5 am: 09193eba96
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1552317

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id61cfe8a61a7e74739770d621afdbf87cbdc5000
2021-02-02 04:41:37 +00:00
Lucas Lin
09193eba96 Merge "Add NetdStaticLibTestsLib into TetheringCoverageTests" am: c0bae3c8c5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1552317

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1d1522a732c456fc43d7f30d90bb237491fc6761
2021-02-02 04:18:57 +00:00
Lucas Lin
c0bae3c8c5 Merge "Add NetdStaticLibTestsLib into TetheringCoverageTests" 2021-02-02 03:38:37 +00:00
Junyu Lai
e2ab8d52f3 Merge "[VCN06.1] Add CTS for request background network" am: fa8d845a6e am: abae927467 am: 0519dd2437
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1553867

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If4fc62fc58d55f3151bd18a646b34f5041a2354b
2021-01-29 23:36:41 +00:00
Junyu Lai
0519dd2437 Merge "[VCN06.1] Add CTS for request background network" am: fa8d845a6e am: abae927467
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1553867

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia117d1e7f6229adef27e5fc2c41c049c06ec96b5
2021-01-29 23:21:03 +00:00
Junyu Lai
abae927467 Merge "[VCN06.1] Add CTS for request background network" am: fa8d845a6e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1553867

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1c4f9d68c9f0ddfcc60514b85380764dbe2f1a93
2021-01-29 22:46:27 +00:00
Junyu Lai
fa8d845a6e Merge "[VCN06.1] Add CTS for request background network" 2021-01-29 11:02:02 +00:00
Junyu Lai
38b5855ff7 [VCN06.1] Add CTS for request background network
Test: android.net.cts.ConnectivityManagerTest#testRequestBackgroundNetwork
Bug: 175662146

Change-Id: Icd7d2bc18c4b328291e96fc3f18828d0421f5b6e
2021-01-29 14:34:38 +08:00
Sudheer Shanka
f0ba6291b1 Check and skip certain operations if they are unsupported.
Fixes: 178334463
Test: com.android.cts.net.HostsideRestrictBackgroundNetworkTests#testMeteredNetworkAccess_expeditedJob
Ignore-AOSP-First: Expedited jobs are not available in AOSP yet
Change-Id: Ie68e17063454e7feeffc93b20b1b8fbb276e837f
2021-01-27 23:18:18 +00:00
lucaslin
5dc7de221a Add NetdStaticLibTestsLib into TetheringCoverageTests
Add NetdStaticLibTestsLib into Tethering MTS , so that the tests
under client-libs can also be run when running tethering MTS.

Bug: 170598012
Test: atest TetheringCoverageTests
Change-Id: Idd47becaa4254ab80b74ad5f3ddcdd4b017a5e69
2021-01-27 17:54:56 +00:00
Treehugger Robot
2b03d6d469 Merge "Dump BPF offload rules for upstream IPv4 and IPv6." am: 0f7f9b6e40 am: 959cc0be9f am: 24ee1bb6a0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1560404

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I013f36607aad1c3eab54aee8ed4526e26018129f
2021-01-27 08:50:39 +00:00
Treehugger Robot
8012b42407 Merge "merge Tether{Down,Up}stream6Value -> Tether6Value" am: 33848955b0 am: 99d1eeebff am: b33e05d475
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1561296

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5556e301146b8fc2a70f535b034f490853a690ea
2021-01-27 08:50:01 +00:00
Remi NGUYEN VAN
578098e526 Merge "Move connectivity-sources to frameworks/base" am: f0be057728 am: 9014776664 am: bc2cb208f3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1552319

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3e4c3de8b9978b6d7731b176de32568cf852ca8e
2021-01-27 08:49:37 +00:00
Treehugger Robot
24ee1bb6a0 Merge "Dump BPF offload rules for upstream IPv4 and IPv6." am: 0f7f9b6e40 am: 959cc0be9f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1560404

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I11f2ca833264943c0bab575c90b6d6ba7aca78e7
2021-01-27 08:28:28 +00:00
Treehugger Robot
b33e05d475 Merge "merge Tether{Down,Up}stream6Value -> Tether6Value" am: 33848955b0 am: 99d1eeebff
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1561296

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieb398ac4c2eb1dcbd13391b06f6277c1a671e540
2021-01-27 08:28:04 +00:00
Remi NGUYEN VAN
bc2cb208f3 Merge "Move connectivity-sources to frameworks/base" am: f0be057728 am: 9014776664
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1552319

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I76299a18360a7a94c0861b70faa32a811f5f553b
2021-01-27 08:27:55 +00:00
Treehugger Robot
959cc0be9f Merge "Dump BPF offload rules for upstream IPv4 and IPv6." am: 0f7f9b6e40
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1560404

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I99ec4cfef0190254f15ffd0b655c441542325720
2021-01-27 08:00:33 +00:00
Treehugger Robot
99d1eeebff Merge "merge Tether{Down,Up}stream6Value -> Tether6Value" am: 33848955b0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1561296

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If041c4a7e87d7b33fa192f1e11abf986ace7df3f
2021-01-27 08:00:18 +00:00
Remi NGUYEN VAN
9014776664 Merge "Move connectivity-sources to frameworks/base" am: f0be057728
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1552319

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3a369158ac3754c47966fa94cb040043573ee2d4
2021-01-27 07:50:14 +00:00
Treehugger Robot
0f7f9b6e40 Merge "Dump BPF offload rules for upstream IPv4 and IPv6." 2021-01-27 07:23:55 +00:00
Treehugger Robot
33848955b0 Merge "merge Tether{Down,Up}stream6Value -> Tether6Value" 2021-01-27 07:18:35 +00:00
Remi NGUYEN VAN
f0be057728 Merge "Move connectivity-sources to frameworks/base" 2021-01-27 07:15:05 +00:00
Maciej Żenczykowski
7dfbcf58d2 merge Tether{Down,Up}stream6Value -> Tether6Value
Test: atest TetheringTests TetheringCoverageTests
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ibdbba9ef6652dd11bb18eba316045dff440fcf9e
2021-01-27 06:41:59 +00:00
Lorenzo Colitti
61976f278f Dump BPF offload rules for upstream IPv4 and IPv6.
Add code to BpfCoordinator to dump upstream IPv4 and IPv6 rules.
For IPv4, currently only the upstream map is printed, because the
downstream map is expected to be symmetrical.

Example output:

=============
    21(21) -> 12(rmnet_data2) 86dd 00:00:00:00:00:00 00:00:00:00:00:00
    [wlan1]: iif(iface) oif(iface) v6addr srcmac dstmac
      12(rmnet_data2) 21(wlan1) /2001:240:2425:b5dc:21a9:995d:bc57:bc37 b2:b5:e0:24:21:c2 ca:06:8d:54:99:ad
    [IPv4]: iif(iface) oif(iface) src nat dst
      21(21) 12(rmnet_data2) 192.168.16.247:41544 -> 100.101.80.108:41544 -> 216.239.36.135:443
      21(21) 12(rmnet_data2) 192.168.16.247:42028 -> 100.101.80.108:42028 -> 8.8.4.4:853
      21(21) 12(rmnet_data2) 192.168.16.247:42032 -> 100.101.80.108:42032 -> 8.8.4.4:853
      21(21) 12(rmnet_data2) 192.168.16.247:42042 -> 100.101.80.108:42042 -> 8.8.4.4:853
      21(21) 12(rmnet_data2) 192.168.16.247:41816 -> 100.101.80.108:41816 -> 8.8.8.8:853
      21(21) 12(rmnet_data2) 192.168.16.247:42040 -> 100.101.80.108:42040 -> 8.8.4.4:853

=============

Also make it possible to do "dumpsys tethering bpf" and get only
the BPF dump.

Test: manual
Change-Id: I2aaa2fdda7d724994090c26feff585f24cd3283b
2021-01-27 14:30:51 +09:00
Lorenzo Colitti
1ae9762100 Merge changes Iaac422d7,Ia7638b31 am: 0913a7a415 am: 51875f6043 am: 798f4b0e56
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1560403

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8709e14b191c55f9a650edf6dc87a84a8f5449d6
2021-01-27 04:28:11 +00:00
Maciej Żenczykowski
52c0a7f446 fix comments am: cff64c8561 am: ec92651a11 am: 08a003ab33
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1561295

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6ed98e10a8873c6b5e86072964783313ba9de7e2
2021-01-27 04:26:17 +00:00
Lorenzo Colitti
eec343935b Add an isEmpty convenience method to BpfMap. am: 77262cea76 am: 63585e9630 am: bb226600c1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1560402

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4a5d933ebce3974a10a8c859b964e3f649bdd7c1
2021-01-27 04:14:29 +00:00
Lorenzo Colitti
57553791e8 Address a TODO in BpfMapTest. am: 7bf39e56e1 am: b62a70bcd2 am: a350221089
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1560401

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I867b1d0bc8d64a81c64d1909d5657e2166d1c327
2021-01-27 04:14:24 +00:00
Lorenzo Colitti
b9602938ef Program the upstream IPv6 map in BpfCoordinator. am: 5b1ed508cf am: e9eb340e3e am: 8c49368ee2
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1557099

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibb815ed4eb9a1d84b4b306aa6ab96d382c816a68
2021-01-27 04:14:23 +00:00
Lorenzo Colitti
1ba4be9119 Rename TetherDownstream6Value to Tether6Value. am: d69a886235 am: 6482088003 am: 80ede0e4d9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1560395

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieb7a49618a6f16053d51429d7183595f2fb2209c
2021-01-27 04:14:21 +00:00
Lorenzo Colitti
798f4b0e56 Merge changes Iaac422d7,Ia7638b31 am: 0913a7a415 am: 51875f6043
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1560403

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia3c2de8b5fe3f64fba280e2637a8d9e9d3e0ea40
2021-01-27 04:11:05 +00:00
Lorenzo Colitti
51875f6043 Merge changes Iaac422d7,Ia7638b31 am: 0913a7a415
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1560403

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I747667f004d2b13fe25789beaf9d6c9101c39692
2021-01-27 03:38:36 +00:00
Lorenzo Colitti
0913a7a415 Merge changes Iaac422d7,Ia7638b31
* changes:
  Remove IpServer.Dependencies#getIfIndex.
  Address comments on aosp/1559686.
2021-01-27 03:04:23 +00:00
Maciej Żenczykowski
08a003ab33 fix comments am: cff64c8561 am: ec92651a11
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1561295

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9fc86e6049d847fbb3f0af8eddb455539d83fa37
2021-01-27 01:36:46 +00:00
Lorenzo Colitti
bb226600c1 Add an isEmpty convenience method to BpfMap. am: 77262cea76 am: 63585e9630
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1560402

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I61adb34e62da8862b50a56c27dfee5cd78b705b6
2021-01-27 01:36:07 +00:00