Commit Graph

44314 Commits

Author SHA1 Message Date
Lucas Lin
c09c9cbd72 Merge "Print the result of command when test is failed" am: c28bb26888 am: 864c93bf07 am: 4ae105f517
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1749262

Change-Id: I79f0989ed49adf0abe190b16472af5c345592ae9
2021-07-01 08:13:21 +00:00
Treehugger Robot
df3eb4551e Merge "Fix testGetAllNetworkStateSnapshots for non-cellular" am: ddf3660af8 am: f786aa57e9 am: a0dd923ffb
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1749483

Change-Id: I5b38f930b1e19868f709f75a4fc9a33eccc6b8ab
2021-07-01 08:13:14 +00:00
Nucca Chen
d7d915d0db Merge "Dump the protocol of IPv4 offload rule" am: 3746fdd293 am: 68657e4e99 am: 64aab1a2a3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1753608

Change-Id: I8d5fb06bdf38e097a39c31d98c0c4639a430b775
2021-07-01 08:13:02 +00:00
Lucas Lin
4ae105f517 Merge "Print the result of command when test is failed" am: c28bb26888 am: 864c93bf07
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1749262

Change-Id: I1ec8cc0a99bcd730792b0d46a6e11119cd2f54fa
2021-07-01 07:55:37 +00:00
Treehugger Robot
a0dd923ffb Merge "Fix testGetAllNetworkStateSnapshots for non-cellular" am: ddf3660af8 am: f786aa57e9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1749483

Change-Id: I983838a0e9a0b32d0ab66bbdcfdb117c9652cf55
2021-07-01 07:55:32 +00:00
Nucca Chen
64aab1a2a3 Merge "Dump the protocol of IPv4 offload rule" am: 3746fdd293 am: 68657e4e99
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1753608

Change-Id: I9847a5c00e9e2ca5ccaa0325016c26028c233784
2021-07-01 07:55:27 +00:00
Lucas Lin
864c93bf07 Merge "Print the result of command when test is failed" am: c28bb26888
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1749262

Change-Id: I53ce359876be0a79899581f62cbcdafcf5074b76
2021-07-01 07:51:03 +00:00
Treehugger Robot
f786aa57e9 Merge "Fix testGetAllNetworkStateSnapshots for non-cellular" am: ddf3660af8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1749483

Change-Id: I426c10c8fd9a17c94423c8e0ddf9811a5cf2cd40
2021-07-01 07:50:55 +00:00
Lucas Lin
c28bb26888 Merge "Print the result of command when test is failed" 2021-07-01 07:49:03 +00:00
Treehugger Robot
ddf3660af8 Merge "Fix testGetAllNetworkStateSnapshots for non-cellular" 2021-07-01 07:44:50 +00:00
Nucca Chen
68657e4e99 Merge "Dump the protocol of IPv4 offload rule" am: 3746fdd293
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1753608

Change-Id: If7ac8041c8ba04f7995c8b9b3d09616222149ec7
2021-07-01 07:43:58 +00:00
TreeHugger Robot
10cbf86448 [automerger skipped] Merge "Fix and test usb function configuration change" into sc-dev am: 424ef2043c am: 0488f2897d -s ours
am skip reason: Merged-In Ia8d76a29646f36941cbb16cd68ae6887100ec8ec with SHA-1 66fa6f24f9 is already in history

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

Change-Id: Ifa5bce46b93a0268ae5afcb07e25f8a3539534d5
2021-07-01 07:31:15 +00:00
TreeHugger Robot
090460a764 [automerger skipped] Merge "Remove wigig support from S tethering" into sc-dev am: 2e0cdad198 am: 3ede39228b -s ours
am skip reason: Merged-In Id0bf02c01419e0c69a1d0b6a41789826538444d3 with SHA-1 cc77000d9a is already in history

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

Change-Id: I1288c1a710d558378cb4cbc59f5f12773cd6c5f5
2021-07-01 07:31:08 +00:00
Nucca Chen
3746fdd293 Merge "Dump the protocol of IPv4 offload rule" 2021-07-01 07:27:20 +00:00
TreeHugger Robot
ba687988a3 [automerger skipped] Merge "Fix and test usb function configuration change" into sc-dev am: 424ef2043c -s ours am: f9930e5ea2 -s ours
am skip reason: Merged-In Ia8d76a29646f36941cbb16cd68ae6887100ec8ec with SHA-1 34f7857b07 is already in history

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

Change-Id: I515c80432c7d64bef83835e02239c4f34d172f04
2021-07-01 07:25:48 +00:00
TreeHugger Robot
10ab8e54f1 [automerger skipped] Merge "Remove wigig support from S tethering" into sc-dev am: 2e0cdad198 -s ours am: 87713e1be2 -s ours
am skip reason: Merged-In Id0bf02c01419e0c69a1d0b6a41789826538444d3 with SHA-1 8f9705126a is already in history

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

Change-Id: I78defec4993034fdfdb33a1b9fd82c4f3e511236
2021-07-01 07:25:42 +00:00
TreeHugger Robot
0488f2897d Merge "Fix and test usb function configuration change" into sc-dev am: 424ef2043c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15142213

Change-Id: I4715b27d4ce6f44411703ede576b20811328f113
2021-07-01 07:15:55 +00:00
TreeHugger Robot
3ede39228b Merge "Remove wigig support from S tethering" into sc-dev am: 2e0cdad198
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15142212

Change-Id: Ia708b28d4b2795e0d4c7615d6b2692f61f850be4
2021-07-01 07:15:40 +00:00
TreeHugger Robot
f9930e5ea2 [automerger skipped] Merge "Fix and test usb function configuration change" into sc-dev am: 424ef2043c -s ours
am skip reason: Merged-In Ia8d76a29646f36941cbb16cd68ae6887100ec8ec with SHA-1 34f7857b07 is already in history

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

Change-Id: I8a89aea4c095ca69a5c16779ac299058da3abbce
2021-07-01 07:14:43 +00:00
TreeHugger Robot
87713e1be2 [automerger skipped] Merge "Remove wigig support from S tethering" into sc-dev am: 2e0cdad198 -s ours
am skip reason: Merged-In Id0bf02c01419e0c69a1d0b6a41789826538444d3 with SHA-1 8f9705126a is already in history

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

Change-Id: I5ca9e9b5e8e01118f0d9bfa6c90b083d78c7f67a
2021-07-01 07:14:35 +00:00
TreeHugger Robot
424ef2043c Merge "Fix and test usb function configuration change" into sc-dev 2021-07-01 07:04:48 +00:00
TreeHugger Robot
2e0cdad198 Merge "Remove wigig support from S tethering" into sc-dev 2021-07-01 07:02:38 +00:00
Hungming Chen
6e94f3575c [automerger skipped] Dump the unused IPv4 BPF rule age correctly am: 59f422694a am: 891ba6680a -s ours
am skip reason: Merged-In Ie771becd2f72518cf02a86e5ae228315785752a5 with SHA-1 59f422694a is already in history

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

Change-Id: I7a961d46c1b2f52422ea94986b98ae540901b605
2021-07-01 05:02:52 +00:00
Hungming Chen
5eb915a8b8 [automerger skipped] Dump the unused IPv4 BPF rule age correctly am: 59f422694a -s ours am: 40f4665fad -s ours
am skip reason: Merged-In Ie771becd2f72518cf02a86e5ae228315785752a5 with SHA-1 e7dff2f955 is already in history

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

Change-Id: I38b3f32c842ab099d9ab5d9399dddb5851b81c7f
2021-07-01 04:57:26 +00:00
Hungming Chen
891ba6680a Dump the unused IPv4 BPF rule age correctly am: 59f422694a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15164992

Change-Id: Iec2505b0d0648718f6d05445f87be87592f25c49
2021-07-01 04:47:37 +00:00
Hungming Chen
40f4665fad [automerger skipped] Dump the unused IPv4 BPF rule age correctly am: 59f422694a -s ours
am skip reason: Merged-In Ie771becd2f72518cf02a86e5ae228315785752a5 with SHA-1 e7dff2f955 is already in history

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

Change-Id: I0e030089ec2fc5fe2ff70615af98d64ebf1f99cc
2021-07-01 04:45:41 +00:00
Hungming Chen
3004f0d8d9 Dump the protocol of IPv4 offload rule
Print the protocol {tcp, udp} of v4 rules in dumpsys.

Format:
proto [inDstMac] iif(iface) src -> nat -> dst [outDstMac] age
  udp [00:00:00:00:00:00] 14(rmnet0) 74.125.10.156:443
  -> 30(30) 10.254.92.123:60262 -> 192.168.128.240:60262
  [0a:bd:b5:e0:41:53] 96067ms

Bug: 190783768
Test: dumpsys tethering
Change-Id: Idae1042cfb454cc97b9b103587f11bc0700e0787
2021-07-01 11:52:12 +08:00
Chiachang Wang
48884dd32f [automerger skipped] Trigger the network score update after setting test allow bad wifi am: 6339ec22ad -s ours am: 9d172cc795 -s ours
am skip reason: Merged-In Ie0f777d0030b66dd306332496192c74f6c183284 with SHA-1 f1e09ef031 is already in history

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

Change-Id: I142ff8e701045635cefd52ac6cb11a14430a8e9d
2021-07-01 03:42:21 +00:00
Chiachang Wang
3e273f0bab [automerger skipped] Trigger the network score update after setting test allow bad wifi am: 6339ec22ad am: a7e58ab6bc -s ours
am skip reason: Merged-In Ie0f777d0030b66dd306332496192c74f6c183284 with SHA-1 f1e09ef031 is already in history

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

Change-Id: I7b307b0a0dc7c0639bec3cd194df5d3b9b0c206c
2021-07-01 03:42:07 +00:00
Chiachang Wang
a7e58ab6bc Trigger the network score update after setting test allow bad wifi am: 6339ec22ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15164990

Change-Id: I6f47ea4d87d1a065599deb1b4775ba817267ccf4
2021-07-01 03:27:26 +00:00
Chiachang Wang
9d172cc795 [automerger skipped] Trigger the network score update after setting test allow bad wifi am: 6339ec22ad -s ours
am skip reason: Merged-In Ie0f777d0030b66dd306332496192c74f6c183284 with SHA-1 f1e09ef031 is already in history

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

Change-Id: Ibeb036ebb9672e753721da2b064158d66dd4233d
2021-07-01 03:26:31 +00:00
Hungming Chen
59f422694a Dump the unused IPv4 BPF rule age correctly
Print a dash for the unused "lastUsed" of the rule.

The age should not equal the bootime if the rule has never been
updated the "lastUsed" field.

Format:
[inDstMac] iif(iface) src -> nat -> dst [outDstMac] age
[00:00:00:00:00:00] 14(rmnet0) 140.112.8.116:443
-> 30(30) 10.170.56.233:43720
-> 192.168.45.236:43720 [be:34:40:28:33:5f] -

Bug: 190783768
Test: dumpsys tethering
Original-Change: https://android-review.googlesource.com/1751022
Merged-In: Ie771becd2f72518cf02a86e5ae228315785752a5
Change-Id: Ie771becd2f72518cf02a86e5ae228315785752a5
2021-07-01 03:23:01 +00:00
Lucas Lin
7059292726 Merge "Simplify the return condition in stop()" am: 584ab08627 am: c955dcc84d am: b278aac2a3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729690

Change-Id: If4f1980844e042eb897db548e5afa10799917aff
2021-07-01 02:33:00 +00:00
Lucas Lin
b278aac2a3 Merge "Simplify the return condition in stop()" am: 584ab08627 am: c955dcc84d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729690

Change-Id: I2dcd10df1d339a1a24e31632b399f960f749d44a
2021-07-01 02:13:04 +00:00
Lucas Lin
c955dcc84d Merge "Simplify the return condition in stop()" am: 584ab08627
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1729690

Change-Id: Ie0701cb9c61afde51b04c902bd9f13f1e0559841
2021-07-01 01:55:56 +00:00
Lucas Lin
584ab08627 Merge "Simplify the return condition in stop()" 2021-07-01 01:46:59 +00:00
Remi NGUYEN VAN
aa56ebdcb7 Merge "Apply jarjar rules on coverage tests" am: d590b30f72 am: 073f6e299a am: 4a980eebf5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1749680

Change-Id: I9ffdff991415b7e353c5962b8fdf0985faa80e2b
2021-07-01 01:22:38 +00:00
Remi NGUYEN VAN
4a980eebf5 Merge "Apply jarjar rules on coverage tests" am: d590b30f72 am: 073f6e299a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1749680

Change-Id: I80209723541bdfb8f5b08cd5e9cf0e76afa3593e
2021-07-01 01:08:32 +00:00
Remi NGUYEN VAN
073f6e299a Merge "Apply jarjar rules on coverage tests" am: d590b30f72
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1749680

Change-Id: Ibd6a0d86d9e70e2cdc83ac0de2f3507902bf8299
2021-07-01 00:52:11 +00:00
Chiachang Wang
6339ec22ad Trigger the network score update after setting test allow bad wifi
Avoid bad wifi design has to apply in both wifi and cellular
networks. Cellular network should contain POLICY_YIELD_TO_BAD_WIFI
policy, then system default network could stay in the wifi after
wifi becomes unvalidated.

The testing API only update the value but not trigger the avoid
bad wifi callback to update the score in the existing cellular
network. Thus, if the cellular network is connected before
setting the overridden value, the yield to bad wifi policy will
not updated to cellular network. The system default network will
still switch from unvalidated wifi network to cellular network
even wifi network is connected with the avoid bad wifi policy.

Update to trigger a reevaluation to update the score in each
NetworkAgent in the ConnectivityService.

Bug: 192149168
Test: atest CtsNetTestCases:android.net.cts.ConnectivityManagerTest\
      #testSetAvoidUnvalidated --rerun-until-failure 100
Original-Change: https://android-review.googlesource.com/1751588
Merged-In: Ie0f777d0030b66dd306332496192c74f6c183284
Change-Id: Ie0f777d0030b66dd306332496192c74f6c183284
2021-07-01 00:32:08 +00:00
Remi NGUYEN VAN
d590b30f72 Merge "Apply jarjar rules on coverage tests" 2021-06-30 23:53:57 +00:00
Treehugger Robot
eee8e24724 Merge "Fix network callback with the same PendingIntent does not release" am: 6d908a513a am: e6517c060f am: 8711b078ff
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727470

Change-Id: I92046b205588e4e88a1866bd81e15748a2ec08a4
2021-06-30 22:25:04 +00:00
Treehugger Robot
8711b078ff Merge "Fix network callback with the same PendingIntent does not release" am: 6d908a513a am: e6517c060f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727470

Change-Id: I2a27b0f3d3204fcfc3cb2d787fa5c998d45e54de
2021-06-30 22:12:04 +00:00
Treehugger Robot
e6517c060f Merge "Fix network callback with the same PendingIntent does not release" am: 6d908a513a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727470

Change-Id: I37b87ca482c8b77444bcb0d0ba575be61ab7d3ad
2021-06-30 21:59:16 +00:00
Treehugger Robot
6d908a513a Merge "Fix network callback with the same PendingIntent does not release" 2021-06-30 21:43:15 +00:00
lucaslin
40d931c474 Simplify the return condition in stop()
Previously, the return condition in stop() will check if the state
is STOPPING and the reason is ERROR_INVALID_NETWORK. The condition
is too restricted so that if another event is happened after binder
died, the exception will be thrown and crash the system.
Since calling stop() twice doesn't make sense, so relax the condition
of return when the state is STOPPING.

Bug: 182586681
Test: atest FrameworksNetTests
Change-Id: I2454c1c080d8954dd3785d4ac6e96fc4131fdb47
2021-07-01 02:29:53 +08:00
Chiachang Wang
e0dfa2face Merge "Trigger the network score update after setting test allow bad wifi" am: 4bb141787b am: 91693952de am: 4143a2f97b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1751588

Change-Id: I4de90ec6772859a5c7fca7eac687d997955970f7
2021-06-30 14:45:46 +00:00
Chiachang Wang
4143a2f97b Merge "Trigger the network score update after setting test allow bad wifi" am: 4bb141787b am: 91693952de
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1751588

Change-Id: I3e544434c4ffeda7eab183f64f9c212ae162588f
2021-06-30 14:33:06 +00:00
Chiachang Wang
91693952de Merge "Trigger the network score update after setting test allow bad wifi" am: 4bb141787b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1751588

Change-Id: Ic9949766b84c1003f7f542aa9ca78d5535d01577
2021-06-30 14:24:32 +00:00
Chiachang Wang
4bb141787b Merge "Trigger the network score update after setting test allow bad wifi" 2021-06-30 14:14:03 +00:00