LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
44,167 Commits 2 Branches 0 Tags
8f05a361da39d64ffdfffee0f04c2717430a0ffb
Commit Graph

44167 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Remi NGUYEN VAN
8f05a361da Merge "Fix null PendingIntent in network listens" am: 27a942cb32 am: 78aa9a4bdc am: 8c89161b52 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1748153

Change-Id: I11eeb5b4c8d25d116dd967be0157e7603ed0a8be
 2021-06-28 07:52:06 +00:00
Remi NGUYEN VAN
8c89161b52 Merge "Fix null PendingIntent in network listens" am: 27a942cb32 am: 78aa9a4bdc 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1748153

Change-Id: I93002b6e1f6a40af501f8af6721865dbdc329984
 2021-06-28 07:40:20 +00:00
Remi NGUYEN VAN
78aa9a4bdc Merge "Fix null PendingIntent in network listens" am: 27a942cb32 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1748153

Change-Id: I85ac14015149779efd3a2d009fffbad31881ab97
 2021-06-28 07:27:47 +00:00
Remi NGUYEN VAN
27a942cb32 Merge "Fix null PendingIntent in network listens" 2021-06-28 07:11:31 +00:00
Treehugger Robot
a8a30e8722 Merge "Move test_mainline_modules to AndroidTest.xml" am: abbee98e86 am: 6709c9b056 am: 2b373de5a4 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1748157

Change-Id: I9e0c74fe6c55a5efdfd67c064915e823689109a6
 2021-06-28 07:07:11 +00:00
Treehugger Robot
2b373de5a4 Merge "Move test_mainline_modules to AndroidTest.xml" am: abbee98e86 am: 6709c9b056 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1748157

Change-Id: Idf16454383a65e6ccc1c4672c7d83e8742512ea7
 2021-06-28 06:57:47 +00:00
Treehugger Robot
6709c9b056 Merge "Move test_mainline_modules to AndroidTest.xml" am: abbee98e86 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1748157

Change-Id: I4078001620ed09d485d98c58dd8e178520773db0
 2021-06-28 06:43:01 +00:00
Junyu Lai
d40a5fb2ef [automerger skipped] Check null NetworkSpecifier before redacting am: 4ad09c4a74 -s ours am: 0304c86c09 -s ours 
am skip reason: Merged-In I5df3547995111fe6340facb94a577296d2228694 with SHA-1 144b6c742a is already in history

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

Change-Id: Iaed52cb9f2efdaa6a6ba158664ebff4b42980148
 2021-06-28 06:37:32 +00:00
Junyu Lai
b058ae216a [automerger skipped] Check null NetworkSpecifier before redacting am: 4ad09c4a74 am: 5202b76a71 -s ours 
am skip reason: Merged-In I5df3547995111fe6340facb94a577296d2228694 with SHA-1 144b6c742a is already in history

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

Change-Id: Id1a5f634087e6a42d65463e87cf6eea4da1b6794
 2021-06-28 06:36:48 +00:00
Treehugger Robot
abbee98e86 Merge "Move test_mainline_modules to AndroidTest.xml" 2021-06-28 06:27:42 +00:00
Junyu Lai
5202b76a71 Check null NetworkSpecifier before redacting am: 4ad09c4a74 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15121422

Change-Id: I9092bfd9eedf04b68fc5f6d8091dcff733d943b7
 2021-06-28 06:19:10 +00:00
Junyu Lai
0304c86c09 [automerger skipped] Check null NetworkSpecifier before redacting am: 4ad09c4a74 -s ours 
am skip reason: Merged-In I5df3547995111fe6340facb94a577296d2228694 with SHA-1 144b6c742a is already in history

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

Change-Id: I7bcdf81fc5457fc697db496c4a04f70dc0801750
 2021-06-28 06:17:54 +00:00
Mark Chien
b621b7796b Merge "Fix and test usb function configuration change" am: 840e2efd7f am: 717c8ff590 am: 4114bb1a2a 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1740778

Change-Id: I0abf965503f5d794c7b4e59b8c8d9af8586297b3
 2021-06-28 04:48:37 +00:00
Mark Chien
4114bb1a2a Merge "Fix and test usb function configuration change" am: 840e2efd7f am: 717c8ff590 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1740778

Change-Id: Iac2ab9a589c878bee92179956df7802ea51c7a3e
 2021-06-28 04:39:21 +00:00
Mark Chien
717c8ff590 Merge "Fix and test usb function configuration change" am: 840e2efd7f 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1740778

Change-Id: I1254083dc5df639fd155f91565ccb46c488b04a8
 2021-06-28 04:27:17 +00:00
Paul Hu
1b4fd02912 Merge "Use appId instead of uid" am: 683c386403 am: 9658c8ea69 am: e6e75faf1d 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1733212

Change-Id: I553d03b3bfd2855d4d257e2f09e758f8a5d8b796
 2021-06-28 04:18:38 +00:00
Mark Chien
840e2efd7f Merge "Fix and test usb function configuration change" 2021-06-28 04:16:14 +00:00
Paul Hu
e6e75faf1d Merge "Use appId instead of uid" am: 683c386403 am: 9658c8ea69 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1733212

Change-Id: Ic23e289c26e4b61864d1343eb0e6494f8cd43587
 2021-06-28 04:07:10 +00:00
Paul Hu
9658c8ea69 Merge "Use appId instead of uid" am: 683c386403 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1733212

Change-Id: I791bb9153f33f7fb188ac06a80a99c0ee9c8dc80
 2021-06-28 03:51:33 +00:00
Paul Hu
683c386403 Merge "Use appId instead of uid" 2021-06-28 03:35:45 +00:00
markchien
34f7857b07 Fix and test usb function configuration change 
Allow stop TETHERING_NCM no matter ncm is used for TETHERING_USB or
TETHERING_NCM.

Add a test:
1. NCM is started for TETHERING_NCM
2. The config changes to use NCM for TETHERING_USB.
3. Then the config changes to use RNDIS for TETHERING_USB.

Also let some logs not only print in dumpsys, but also in logcat to
easiler debug unit test.

Bug: 185649441
Test: atest TetheringTests
Change-Id: Ia8d76a29646f36941cbb16cd68ae6887100ec8ec
 2021-06-28 02:59:33 +00:00
Remi NGUYEN VAN
8b2a47c867 Move test_mainline_modules to AndroidTest.xml 
When an AndroidTest.xml is used, configuration needs to be in the
AndroidTest.xml file, not in the Android.bp.

This currently causes tests not to be run in TEST_MAPPING as they should
be.

Test: TH needs to test
Bug: 187935317
Change-Id: Ie0aca0c64646825175769cd375bcecf65de4b4c8
 2021-06-28 10:55:15 +09:00
Junyu Lai
4ad09c4a74 Check null NetworkSpecifier before redacting 
Do null check before redacting, since NetworkSpecifier will not
always be attached. For example, NetworkSpecifier of wifi
network is only attached when a wifi network is created
in response to a network request with specifier attached.

Test: atest CtsNetTestCases:android.net.cts.ConnectivityManagerTest#testGetAllNetworkStateSnapshots \
      --rerun-until-failure 100
      (tested on cuttlefish mobile and wifi)
Bug: 191944987
Original-Change: https://android-review.googlesource.com/1747893
Merged-In: I5df3547995111fe6340facb94a577296d2228694
Change-Id: I5df3547995111fe6340facb94a577296d2228694
 2021-06-28 01:22:42 +00:00
Remi NGUYEN VAN
aedc6bec44 Merge "Improve TestConnectivityManager readability" am: 883df67f3f am: 265ec28e25 am: 59be04dcca 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1733779

Change-Id: I515de6f92e63fdf97ed6239c879f60afebf9e390
 2021-06-28 00:24:39 +00:00
Remi NGUYEN VAN
1e238a87e9 Fix null PendingIntent in network listens 
In S ConnectivityService was changed to use getActiveRequest() to fill
EXTRA_NETWORK_REQUEST, but there is no active request in the case of
listens.

When getActiveRequest() is missing, use the first mRequest instead. This
should match previous behavior.

Bug: 191713869
Test: atest android.net.cts.ConnectivityManagerTest
Change-Id: Id7343a4cc020aba16b7979b16334721c56b2839c
 2021-06-28 09:14:30 +09:00
Remi NGUYEN VAN
59be04dcca Merge "Improve TestConnectivityManager readability" am: 883df67f3f am: 265ec28e25 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1733779

Change-Id: Ic81a3604724855233dffc4e989bcee69feb8d91c
 2021-06-28 00:13:10 +00:00
Remi NGUYEN VAN
265ec28e25 Merge "Improve TestConnectivityManager readability" am: 883df67f3f 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1733779

Change-Id: I755a697fd3170853598dad692728994805e9b36c
 2021-06-28 00:01:06 +00:00
Remi NGUYEN VAN
883df67f3f Merge "Improve TestConnectivityManager readability" 2021-06-27 23:47:45 +00:00
Nucca Chen
becf5725f4 [automerger skipped] Refresh conntrack entry timeout am: fadd7b7a33 -s ours am: 6143194eb0 -s ours 
am skip reason: Merged-In Idbcf686c9b2124b192944156ac5111be741744fb with SHA-1 c27ec7c4a2 is already in history

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

Change-Id: I0ee0472228a86b6d31ff7d11e4fb1a92e32393be
 2021-06-26 16:14:36 +00:00
Nucca Chen
a3f7e3f285 [automerger skipped] Clear IPv4 offload rules when tethering stopped am: 01785d7eff -s ours am: 06862bc365 -s ours 
am skip reason: Merged-In Id505a3deb277bbe0f44403234d8ca8bbf01eec80 with SHA-1 a6e7869646 is already in history

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

Change-Id: I16663daa008c00dcac621efba3ff9c4b0b54ce0f
 2021-06-26 16:14:31 +00:00
Nucca Chen
074bab2400 [automerger skipped] Refresh conntrack entry timeout am: fadd7b7a33 am: 34fc8d990d -s ours 
am skip reason: Merged-In Idbcf686c9b2124b192944156ac5111be741744fb with SHA-1 c27ec7c4a2 is already in history

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

Change-Id: Ic5043d9fe90f3cedcef9d7910eb0b5bc9a2ba675
 2021-06-26 16:14:22 +00:00
Nucca Chen
407fc5e1f1 [automerger skipped] Clear IPv4 offload rules when tethering stopped am: 01785d7eff am: 3cf0c93a3c -s ours 
am skip reason: Merged-In Id505a3deb277bbe0f44403234d8ca8bbf01eec80 with SHA-1 a6e7869646 is already in history

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

Change-Id: I943785ef5ee461f3c47b3d42d660b0dfd6ed4c98
 2021-06-26 16:14:14 +00:00
Nucca Chen
34fc8d990d Refresh conntrack entry timeout am: fadd7b7a33 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15114804

Change-Id: I87229a3c9ecd63987e10ae76b05c755eb3b31580
 2021-06-26 16:06:02 +00:00
Nucca Chen
3cf0c93a3c Clear IPv4 offload rules when tethering stopped am: 01785d7eff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15114803

Change-Id: I1a73e28f9ac418bc0a8c8dc2524ea0ab322f788f
 2021-06-26 16:05:51 +00:00
Nucca Chen
6143194eb0 [automerger skipped] Refresh conntrack entry timeout am: fadd7b7a33 -s ours 
am skip reason: Merged-In Idbcf686c9b2124b192944156ac5111be741744fb with SHA-1 c27ec7c4a2 is already in history

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

Change-Id: I86cd23cf49240ef231d08b80266773ad1ece00c7
 2021-06-26 16:04:45 +00:00
Nucca Chen
06862bc365 [automerger skipped] Clear IPv4 offload rules when tethering stopped am: 01785d7eff -s ours 
am skip reason: Merged-In Id505a3deb277bbe0f44403234d8ca8bbf01eec80 with SHA-1 a6e7869646 is already in history

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

Change-Id: I077e68f63688457fb293e7debb24aadf063f1be0
 2021-06-26 16:04:38 +00:00
Nucca Chen
fadd7b7a33 Refresh conntrack entry timeout 
Needed because the BPF maps offloads IPv4 traffic. The kernel can't
trace the offloaded traffic to keep the conntrack entry.

Bug: 190783768
Test: atest TetheringCoverageTests
Original-Change: https://android-review.googlesource.com/1566871
Merged-In: Idbcf686c9b2124b192944156ac5111be741744fb
Change-Id: Idbcf686c9b2124b192944156ac5111be741744fb
 2021-06-26 08:48:52 +00:00
Nucca Chen
01785d7eff Clear IPv4 offload rules when tethering stopped 
The condition for deleting IPv4 forwarding rules.
1. When the tethering client has gone, deletes the client and its
   rules.
2. When the upstream has gone, deletes all rules.
3. When the upstream has changed, deletes all rules.

Test: atest TetheringCoverageTests and check IPv4 offload rules
via dumpsys tethering in the following test cases.

Bug: 190783768

Test cases:
a. Loss upstream interface while tethering
  1. Enable WIFI tethering
  2. Disable upstream interface
  3. Check the rules are removed.
b. Loss downstream interfaces while tethering
  1. Enable WIFI tethering
  2. Enable BT tethering
  3. Disable BT tethering
  4. Check the BT tether rules are removed.
  5. Disable WIFI tethering
  6. Check the WIFI tether rules are removed.
c. Switch upstream interface while tethering
  1. Enable WIFI tethering
  2. Enable BT tethering
  3. Switch upstream interface from cellular to wifi.
  4. Check all rules are removed.
d. Enable NAT failure (manual)

Log:
The rule deletion in each case.
- IpServer#stopIPv4: case b and case d.
- BpfCoordinator#updateUpstreamNetworkState: case a and case c.

Test case a
06-23 09:58:59.245  [...] Tethering: [BpfCoordinator]
    updateUpstreamNetworkState tetherOffloadRule4Clear wlan2

Test case b
06-07 22:17:51.886  [..] Tethering: [bt-pan] cleanupUpstream bt-pan
06-07 22:17:51.888  [..] Tethering: [bt-pan] stopIPv4 bt-pan
06-07 22:18:23.769  [..] Tethering: [wlan2] cleanupUpstream wlan2
06-07 22:18:23.772  [..] Tethering: [wlan2] stopIPv4 wlan2

Test case c
06-08 11:11:48.277  [..] Tethering: [BpfCoordinator]
    updateUpstreamNetworkState tetherOffloadRule4Clear bt-pan
06-08 11:11:48.396  [..] Tethering: [BpfCoordinator]
    updateUpstreamNetworkState tetherOffloadRule4Clear wlan2
06-08 11:11:48.579  [..] Tethering: [wlan2] cleanupUpstreamInterface
    wlan2
06-08 11:11:48.808  [..] Tethering: [bt-pan] cleanupUpstreamInterface
    bt-pan

Enabling NAT failure
06-08 13:04:18.117  [..] Tethering: [wlan2] Exception enabling NAT [..]
06-08 13:04:18.234  [..] Tethering: [wlan2] cleanupUpstream wlan2
06-08 13:04:18.246  [..] Tethering: [wlan2] stopIPv4 wlan2

Original-Change: https://android-review.googlesource.com/1579873
Merged-In: Id505a3deb277bbe0f44403234d8ca8bbf01eec80
Change-Id: Id505a3deb277bbe0f44403234d8ca8bbf01eec80
 2021-06-26 08:45:39 +00:00
Nucca Chen
c3eae7d248 Merge "Refresh conntrack entry timeout" am: a569410667 am: a729b103ff am: 2791e3fe11 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1566871

Change-Id: Ic7a521b534d0d736205e75f339e26982e5117a9b
 2021-06-25 19:15:07 +00:00
Nucca Chen
f28cbe6dc7 Merge "Clear IPv4 offload rules when tethering stopped" am: 7238b31c15 am: 70504b2f6b am: 8516b3f120 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1579873

Change-Id: I8ca385bf163374c8ae2dd3762fdca4a5352ffac5
 2021-06-25 19:14:18 +00:00
Nucca Chen
2791e3fe11 Merge "Refresh conntrack entry timeout" am: a569410667 am: a729b103ff 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1566871

Change-Id: I5508b5b47d17c01d2ce95fb30d9dfc14e279f932
 2021-06-25 18:55:47 +00:00
Nucca Chen
8516b3f120 Merge "Clear IPv4 offload rules when tethering stopped" am: 7238b31c15 am: 70504b2f6b 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1579873

Change-Id: Ibfea3e14e0e06a59c3b29534ab5ffbf4d4bd2148
 2021-06-25 18:55:09 +00:00
Nucca Chen
a729b103ff Merge "Refresh conntrack entry timeout" am: a569410667 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1566871

Change-Id: I13894c11c848b85d4647ffecb359420421839896
 2021-06-25 18:45:23 +00:00
Nucca Chen
70504b2f6b Merge "Clear IPv4 offload rules when tethering stopped" am: 7238b31c15 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1579873

Change-Id: I61fccead9b9fdd7a2553fe57b5734d67f3eff59a
 2021-06-25 18:41:30 +00:00
Nucca Chen
a569410667 Merge "Refresh conntrack entry timeout" 2021-06-25 18:34:22 +00:00
Nucca Chen
7238b31c15 Merge "Clear IPv4 offload rules when tethering stopped" 2021-06-25 17:56:21 +00:00
Junyu Lai
864b20f8e5 [automerger skipped] Merge changes I81bf8969,I2edba513,Ibb913979 am: c06260b5b5 am: b1ef107d82 -s ours am: 768c00f18f -s ours 
am skip reason: Merged-In I81bf8969ace3cb6826b30c5bbd0b896c64c73c57 with SHA-1 ee93b3d3b3 is already in history

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

Change-Id: I6b44f7c7f16bc8b9102985fe73dd3a3db4da205d
 2021-06-25 16:11:11 +00:00
Chalard Jean
4497e05922 [automerger skipped] Add some CTS tests for NetworkScore. am: b8c396b3b5 am: 35eddb4f18 -s ours am: 925257538c -s ours 
am skip reason: Merged-In I2edba51351cd4c71727663aa85b1d5141bff2a15 with SHA-1 2d2ecc3cfb is already in history

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

Change-Id: I434278e20d247c059e98ab9c34f77782ecf11279
 2021-06-25 16:11:09 +00:00
Chalard Jean
bd05c2f3a9 [automerger skipped] Add a first CTS for NetworkScore am: e349356eb9 am: 04014f708c -s ours am: 311b91f349 -s ours 
am skip reason: Merged-In Ibb9139798ce44d748e87bae79a1e23311ec8d9b6 with SHA-1 aac204b202 is already in history

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

Change-Id: I91f6f35786dbb6e7c2fe6db8671ce327e80cec8e
 2021-06-25 16:11:08 +00:00
Junyu Lai
6a1c975562 Merge "Check null NetworkSpecifier before redacting" am: 435c4f7fc5 am: 9c5e87388d am: 6efa057bf5 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1747893

Change-Id: I5ebb779b147125295d355ca6d3654a13202175f5
 2021-06-25 16:10:58 +00:00