LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
43,130 Commits 2 Branches 0 Tags
9bcde3bd202feb58ba55eccde472ec53cbab5d63
Commit Graph

43130 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Hu
9bcde3bd20 Merge "Specify which callback is unexpected in testMobileDataPreferredUids" am: c4898b85ce am: 17c492e08f 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1817916

Change-Id: Ib7464c690d3b57773eb029e30daa2acaeb217a57
 2021-10-20 06:05:10 +00:00
Paul Hu
17c492e08f Merge "Specify which callback is unexpected in testMobileDataPreferredUids" am: c4898b85ce 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1817916

Change-Id: I7210fea1f79ccb5d0e1e7db6d724759b4c686824
 2021-10-20 05:52:41 +00:00
Paul Hu
c4898b85ce Merge "Specify which callback is unexpected in testMobileDataPreferredUids" 2021-10-20 05:39:19 +00:00
Treehugger Robot
6cecfae8ab Merge "Fix TetheringManager memory leak" am: d7d41a73e7 am: 059afb99bb 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1744513

Change-Id: I93d4c5bb23cb45e10dbcd8b19792d9b79baa3ff4
 2021-10-20 04:33:03 +00:00
Treehugger Robot
059afb99bb Merge "Fix TetheringManager memory leak" am: d7d41a73e7 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1744513

Change-Id: I0cd6e631a1340d144ff052ec9b6ff6d449dc47c9
 2021-10-20 04:12:42 +00:00
Treehugger Robot
d7d41a73e7 Merge "Fix TetheringManager memory leak" 2021-10-20 03:59:59 +00:00
Treehugger Robot
0163c5b779 Merge "Exclude testGetMultipathPreference on no Wi-Fi devices" am: 9755b43575 am: 69da276bc4 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1848993

Change-Id: I99f87ff6e1400e1b4c368deaca6e07b022a37dfe
 2021-10-20 02:39:46 +00:00
Treehugger Robot
69da276bc4 Merge "Exclude testGetMultipathPreference on no Wi-Fi devices" am: 9755b43575 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1848993

Change-Id: Ide421240ab056248b5464b54b6db52c7fd3c9c88
 2021-10-20 02:22:04 +00:00
Treehugger Robot
9755b43575 Merge "Exclude testGetMultipathPreference on no Wi-Fi devices" 2021-10-20 02:10:47 +00:00
paulhu
c344c9fb9c Specify which callback is unexpected in testMobileDataPreferredUids 
This test is flaky due to assertNoCallback(). Because this
method expects no any callback received but the wifi network
may update its capabilities during testing and trigger
onCapabilitiesChanged() to cause test failed. Thus, these
callbacks should be ignored in the tests.

Replace the assertNoCallback to assertNoCallbackThat with
callback type specified to deflake tests.

Also align the available callback verification in the test to
avoid confusion.

Fix: 198367703
Test: atest android.net.cts.ConnectivityManagerTest\
      --iterations 20
Change-Id: Ifde5e9730823c3b6f32590cc436cc4ba11d2b36e
 2021-10-19 18:27:19 +08:00
Lucas Lin
660904140c Merge "Add new APIs in NetworkCapabilities to set and get underlying networks" am: 39379a40bd am: f96e107603 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1829934

Change-Id: I269398fde17a82cbc6b1a88abc2f57bcb908ed65
 2021-10-18 06:03:56 +00:00
Lucas Lin
f96e107603 Merge "Add new APIs in NetworkCapabilities to set and get underlying networks" am: 39379a40bd 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1829934

Change-Id: I576812f62add322752c3991bec460b978c9fba61
 2021-10-18 05:46:11 +00:00
Lucas Lin
39379a40bd Merge "Add new APIs in NetworkCapabilities to set and get underlying networks" 2021-10-18 05:27:59 +00:00
lucaslin
8b2dfa7c02 Add new APIs in NetworkCapabilities to set and get underlying networks 
Previously, the caller can only know about the transport type of
the underlying network. The information might not be enough if
the device support WiFi STA+STA.
Thus, provide an API for the caller to get the correct underlying
network.

Bug: 191918368
Test: atest FrameworksNetTests:NetworkCapabilitiesTest
Change-Id: I7752b2356770f4572f6ca4cbaecaa45c09d6d72f
 2021-10-15 18:07:12 +08:00
Treehugger Robot
0109ba492c Merge "Update Permission only if the network is created" am: 29f0350da3 am: 40ea750175 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1827912

Change-Id: Icf77e2189bd13e4b75363d522a8ac9637760bf15
 2021-10-14 06:37:12 +00:00
Treehugger Robot
40ea750175 Merge "Update Permission only if the network is created" am: 29f0350da3 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1827912

Change-Id: Iaa41edbfe275556c009c00c48dd4a712e6eff3a7
 2021-10-14 06:27:02 +00:00
Treehugger Robot
29f0350da3 Merge "Update Permission only if the network is created" 2021-10-14 06:13:54 +00:00
markchien
1110b725a0 Fix TetheringManager memory leak 
TetheringCallbackInteranl is inner class which explicitly reference
TetheringManager object. This causes TetheringManager can't be GC. Using
static nested class which has its own lifecycle and weak reference
TetheringManager object.

Still have a leak inside Tethering that TetheringCallbackInternal is
never unregistered. Currently it rely on binder died to remove the
reference, which usually happen in kill process. If process keep alive,
the TetheringCallbackInternal would not be freed even TetheringManager is
gone. Will have follow CL to fix this.

Bug: 177265744
Bug: 191798390
Bug: 187972579
Test: 1. lunch Settings with ON/OFF tethering, dump java heap.
      2. close Settings and restart Settings again, dump java heap.
      3. Compare java heap between step 1 and step 2.
Change-Id: I0e2a21b7988115098a033a581cd98da8bffe2791
 2021-10-14 14:02:11 +08:00
Treehugger Robot
d4c5e13ebe Merge "Ignore testRestrictedNetworkPermission on Q" am: 6b6d2eb75b am: ccb213843c 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1826056

Change-Id: I57bd2a913cc23370ad064054b41cb29c68b80d46
 2021-10-13 07:37:44 +00:00
Treehugger Robot
ccb213843c Merge "Ignore testRestrictedNetworkPermission on Q" am: 6b6d2eb75b 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1826056

Change-Id: Ib8043933f8f3dcd029f0acb601035d96204e2ddd
 2021-10-13 07:22:32 +00:00
Treehugger Robot
6b6d2eb75b Merge "Ignore testRestrictedNetworkPermission on Q" 2021-10-13 07:01:33 +00:00
Xin Li
1fc4fa89ea [automerger skipped] Merge Android 12 am: 301d6bdfa6 -s ours am: 0d63d026fb -s ours 
am skip reason: Merged-In I3ae21d9b034e455ba48d9576712a102ccda0f647 with SHA-1 6e1c375f50 is already in history

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

Change-Id: I8a28a92726e1dadcecf2b4eef1b7784ca79b1ddf
 2021-10-08 01:39:50 +00:00
Xin Li
0d63d026fb [automerger skipped] Merge Android 12 am: 301d6bdfa6 -s ours 
am skip reason: Merged-In I3ae21d9b034e455ba48d9576712a102ccda0f647 with SHA-1 6e1c375f50 is already in history

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

Change-Id: I00bbe32399a8a3952642c1ac1d02f2aeecfa373e
 2021-10-08 01:20:24 +00:00
Chiachang Wang
1c3cdce86d Exclude testGetMultipathPreference on no Wi-Fi devices 
Bug: 202228414
Test: atest CtsNetTestCases
Change-Id: I3112ffb816fd16b2fc7a87c35d8f95eef0144281
 2021-10-07 13:19:32 +08:00
Xin Li
301d6bdfa6 Merge Android 12 
Bug: 202323961
Merged-In: I3ae21d9b034e455ba48d9576712a102ccda0f647
Change-Id: I0b895d155dfb440a3788cc950a8c76fe8b505dd0
 2021-10-06 22:54:04 +00:00
Treehugger Robot
039876779e Merge "Support wifi and ethernet connection for DnsResolverTest." am: f822038c1c am: 6e1c375f50 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1833253

Change-Id: I595116f9996eca55f60708bfb817577a8b5b624b
 2021-10-06 09:10:33 +00:00
Treehugger Robot
6e1c375f50 Merge "Support wifi and ethernet connection for DnsResolverTest." am: f822038c1c 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1833253

Change-Id: I3ae21d9b034e455ba48d9576712a102ccda0f647
 2021-10-06 08:52:12 +00:00
Treehugger Robot
f822038c1c Merge "Support wifi and ethernet connection for DnsResolverTest." 2021-10-06 08:34:52 +00:00
Chalard Jean
5274a841f1 Merge "Add a small usage comment" am: a898f0a039 am: 7f40360e32 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1844182

Change-Id: Id953e7f7d5fa0067fc98a0489230c5ab480b7aa8
 2021-10-05 11:27:22 +00:00
Chalard Jean
7f40360e32 Merge "Add a small usage comment" am: a898f0a039 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1844182

Change-Id: Ibe27d64cd16a2ef44d6a41b94f81a0daa06c523b
 2021-10-05 11:14:01 +00:00
Chalard Jean
a898f0a039 Merge "Add a small usage comment" 2021-10-05 10:57:59 +00:00
steven_fann
fa8dbc5da7 Support wifi and ethernet connection for DnsResolverTest. 
Issue: 199675828
Test: atest CtsNetTestCases:android.net.cts.DnsResolverTest

Change-Id: Ie1c7522426314ccc83008b75f90a57f3a53339d4
 2021-10-05 15:36:35 +08:00
Paul Hu
707437622a Merge "Stop using PerUidCounter#transact" am: a7db5ddda5 am: fe5e2742b6 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1821293

Change-Id: I854dedc194d11b7042f9e13da7e0a3151b25bdcf
 2021-10-04 14:11:12 +00:00
Paul Hu
fe5e2742b6 Merge "Stop using PerUidCounter#transact" am: a7db5ddda5 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1821293

Change-Id: Icd1072ef5b8281fa54f71796e7eaa981b0fd943b
 2021-10-04 13:58:26 +00:00
Paul Hu
a7db5ddda5 Merge "Stop using PerUidCounter#transact" 2021-10-04 13:48:07 +00:00
Treehugger Robot
b13c54fd94 Merge "Increase timeouts for loopers" am: 2ed9b3dc70 am: b370da94ec 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1844177

Change-Id: Iaa8fcbb24c252c53c90af85999be6f205979b322
 2021-10-04 11:11:12 +00:00
Treehugger Robot
b370da94ec Merge "Increase timeouts for loopers" am: 2ed9b3dc70 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1844177

Change-Id: I8062108d1faf53bf9efbfb947f3238f02b7cf34f
 2021-10-04 10:58:27 +00:00
Treehugger Robot
2ed9b3dc70 Merge "Increase timeouts for loopers" 2021-10-04 10:42:59 +00:00
Treehugger Robot
9e24f96b5a Merge "Add Override anntation for TetheringConnector.setPreferTestNetworks" am: 1503bdc297 am: 1f3515bb48 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1844178

Change-Id: Iafd4e98db3c3314a92fcbe094826230d2fb5cb48
 2021-10-04 10:11:09 +00:00
Treehugger Robot
da756e286b Merge "Remove "when" usage in ConnectivityServiceTest" am: f697c61406 am: 7366c89d64 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1844176

Change-Id: I54a2b95d21f8655c0268d351a4e27b54a2bce579
 2021-10-04 10:11:04 +00:00
Treehugger Robot
1f3515bb48 Merge "Add Override anntation for TetheringConnector.setPreferTestNetworks" am: 1503bdc297 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1844178

Change-Id: Ie1f715a7b3ac4d46a25c58e799fb133dfdc55951
 2021-10-04 10:00:56 +00:00
Treehugger Robot
7366c89d64 Merge "Remove "when" usage in ConnectivityServiceTest" am: f697c61406 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1844176

Change-Id: I9197503f4f19748824ab3cc1efc8d540779399ec
 2021-10-04 10:00:40 +00:00
Treehugger Robot
1503bdc297 Merge "Add Override anntation for TetheringConnector.setPreferTestNetworks" 2021-10-04 09:50:19 +00:00
Treehugger Robot
f697c61406 Merge "Remove "when" usage in ConnectivityServiceTest" 2021-10-04 09:42:47 +00:00
Chalard Jean
025f40bc4f Add a small usage comment 
Test: comment-only change
Bug: 201972281
Change-Id: Ifbdadbaacfaf364f6770e56ccb816eb3269003d5
 2021-10-04 18:33:36 +09:00
Chalard Jean
1afb2e33e2 Increase timeouts for loopers 
In coverage tests this seems to randomly fail, which suggests
some delay. Have a constant for timeout and increase its value
significantly where it makes no functional difference.

Test: FrameworksNetTests
Change-Id: I035d865f01688daf3bce30c5130ce550fa84b885
 2021-10-04 18:02:17 +09:00
Aaron Huang
3820c8b69c Merge "Enable/disable FrameworksNetTests" am: d1ed1cb8b7 am: 045f47bc31 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1843117

Change-Id: Id1819e5f4af41d325c1269dedb21347693314841
 2021-10-04 08:21:10 +00:00
markchien
d3e0f2e896 Add Override anntation for TetheringConnector.setPreferTestNetworks 
Test: TH
Change-Id: Idfaca3cb59580ffe4ee194466ad2ba8f47d8fac4
 2021-10-04 16:14:08 +08:00
Aaron Huang
045f47bc31 Merge "Enable/disable FrameworksNetTests" am: d1ed1cb8b7 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1843117

Change-Id: Ida093c6792bed45d5f65e3ea0e567eb30de74807
 2021-10-04 08:07:21 +00:00
Remi NGUYEN VAN
d7331e929f Remove "when" usage in ConnectivityServiceTest 
"when" is not thread-safe, as it relies on global state to find which
mock was called with the method to mock in its parameters.

This causes flakes where non-test code that interacts with the mock may
be called from another thread between the contents of "when" and the
"when" method another thread, causing UnfinishedStubbingExceptions or
other test errors. In particular
ConnectivityService#getNetworkCapabilitiesInternal was seen to be
wrongly identified as a mocking site for Dependencies.

Replace all usages with doReturn().when(mock).method() syntax, which has
better thread safety since global state is not necessary to tie the
mock, mocked method and return value.

Bug: 195626111
Test: atest ConnectivityServiceTest
Change-Id: I57c5ffb3b3f799fc59c3af4ccb323fb5d6794fad
 2021-10-04 17:03:44 +09:00