Commit Graph

44187 Commits

Author SHA1 Message Date
Treehugger Robot
4e703da944 Merge "Fix flakes in tests running after testIsPrivateDnsBroken" am: de7eb04d71 am: d2b7990122 am: cb97471321
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1749560

Change-Id: Ib88f9aedaa864176c79e28e2e4557b9e1d81d44f
2021-06-28 11:01:15 +00:00
Treehugger Robot
cb97471321 Merge "Fix flakes in tests running after testIsPrivateDnsBroken" am: de7eb04d71 am: d2b7990122
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1749560

Change-Id: Id6d77c1eb1f862605ce741c894f895ad16ca4cc9
2021-06-28 10:46:56 +00:00
Treehugger Robot
d2b7990122 Merge "Fix flakes in tests running after testIsPrivateDnsBroken" am: de7eb04d71
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1749560

Change-Id: Ib7b4f8ea428c0becff28b541db84529024cddd36
2021-06-28 10:37:05 +00:00
Treehugger Robot
de7eb04d71 Merge "Fix flakes in tests running after testIsPrivateDnsBroken" 2021-06-28 10:26:24 +00:00
Treehugger Robot
b3cb552c43 Merge "Make "dumpsys tethering" print the number of registered callbacks." am: 1e50b3ea24 am: 2d4eb7e18d am: aad77e7ce4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1749480

Change-Id: Ib4f52f94a6199cf3ac80b2ef5a1b1a7bdf34ab20
2021-06-28 10:24:27 +00:00
Treehugger Robot
aad77e7ce4 Merge "Make "dumpsys tethering" print the number of registered callbacks." am: 1e50b3ea24 am: 2d4eb7e18d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1749480

Change-Id: Ia2351cde37d919b7dba7b609b556c08533a978ff
2021-06-28 10:15:26 +00:00
Treehugger Robot
2d4eb7e18d Merge "Make "dumpsys tethering" print the number of registered callbacks." am: 1e50b3ea24
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1749480

Change-Id: Ib348a653fe8e66634aba2fab38949b8595624474
2021-06-28 10:07:02 +00:00
Treehugger Robot
1e50b3ea24 Merge "Make "dumpsys tethering" print the number of registered callbacks." 2021-06-28 09:50:04 +00:00
Treehugger Robot
e459d59596 Merge "Remove wigig support from S tethering" am: 0b44491744 am: 8027e83cf1 am: bb8f070cb3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1744652

Change-Id: I77489ba940b9d356e3fa053e5a4e92b4726940b3
2021-06-28 08:31:16 +00:00
Treehugger Robot
bb8f070cb3 Merge "Remove wigig support from S tethering" am: 0b44491744 am: 8027e83cf1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1744652

Change-Id: I80b9877ef5d0bc21a2bdb31d506214d5823d5dc6
2021-06-28 08:16:56 +00:00
Treehugger Robot
8027e83cf1 Merge "Remove wigig support from S tethering" am: 0b44491744
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1744652

Change-Id: I22b34d200a016186848b59af1c7b53a47e59016e
2021-06-28 08:03:57 +00:00
Remi NGUYEN VAN
3d99032422 Merge "Fix ConnectivityManagerTest initialization on Q" am: 72f59b3019 am: 82a32e3f4a am: 9f4a31af59
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1740779

Change-Id: I2454bfd0c321edb4e1e90d671b9cb05e04d67bb2
2021-06-28 07:52:25 +00:00
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
Treehugger Robot
0b44491744 Merge "Remove wigig support from S tethering" 2021-06-28 07:51:07 +00:00
Remi NGUYEN VAN
9f4a31af59 Merge "Fix ConnectivityManagerTest initialization on Q" am: 72f59b3019 am: 82a32e3f4a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1740779

Change-Id: I40abcac7db563480fe3c13fb5e0178d7a3629652
2021-06-28 07:40:27 +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
82a32e3f4a Merge "Fix ConnectivityManagerTest initialization on Q" am: 72f59b3019
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1740779

Change-Id: Iea8a7bbe63a16efc10733dd94cccc77560a7a058
2021-06-28 07:28:05 +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
72f59b3019 Merge "Fix ConnectivityManagerTest initialization on Q" 2021-06-28 07:24:49 +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
Remi NGUYEN VAN
582770ce68 Fix flakes in tests running after testIsPrivateDnsBroken
The test would not reconnect wifi after restoring the private DNS setting,
so validation would not be triggered, and it would remain identified as
having broken private DNS.

Reconnect wifi after the test to avoid affecting subsequent tests.

Change-Id: Id9beba94e0fed85bd26c0509ad61369be794f3c3
Test: atest android.net.cts.ConnectivityManagerTest
Bug: 182296835
2021-06-28 06:58:51 +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
Lorenzo Colitti
ced68f5993 Make "dumpsys tethering" print the number of registered callbacks.
Test: manual
Bug: 177265744
Change-Id: I07f56459125d5629dcafe5683eecb42d0ef9e2bd
2021-06-28 12:46:37 +09: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
0d54d7992d Fix ConnectivityManagerTest initialization on Q
The test can't have TetheringManager as an argument to methods or a
field, otherwise the test runner will crash when scanning the class for
tests because TetheringManager did not exist in Q. Although
testFactoryReset is already skipped on Q, the test runner would fail
at initialization time, before starting the run.

Use CtsTetheringUtils instead. This ensures that TetheringManager does
not have method signatures or members that reference classes that do not
exist on Q, so the test runner can scan the class successfully before
starting the run.

Bug: 188851796
Test: atest ConnectivityManagerTest on Q
Change-Id: I87488d0f23628a1ef2d7af0242513fcc5401d598
2021-06-28 11:24:27 +09: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