LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
43,189 Commits 2 Branches 0 Tags
67ee51673274064144fe12fa0efa6abeb7608cee
Commit Graph

43189 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xin Li
67ee516732 [automerger skipped] Merge Android 12 am: 301d6bdfa6 -s ours am: 0d63d026fb -s ours am: 1fc4fa89ea -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: I745ef4d42ecaf06bb81d9dbe0b7162267fea65a8
 2021-10-08 07:57:05 +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
Xin Li
301d6bdfa6 Merge Android 12 
Bug: 202323961
Merged-In: I3ae21d9b034e455ba48d9576712a102ccda0f647
Change-Id: I0b895d155dfb440a3788cc950a8c76fe8b505dd0
 2021-10-06 22:54:04 +00:00
Treehugger Robot
4178cb45dd Merge "Support wifi and ethernet connection for DnsResolverTest." am: f822038c1c am: 6e1c375f50 am: 039876779e 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1833253

Change-Id: I32c32b72233d66a7f4510618d33b4d5905a3f552
 2021-10-06 09:21:19 +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
a29760aa9b Merge "Add a small usage comment" am: a898f0a039 am: 7f40360e32 am: 5274a841f1 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1844182

Change-Id: I67f8526e4b959fc93ee7be5b5f83e55cf5d63c1d
 2021-10-05 11:40:40 +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
2541cf6d81 Merge "Stop using PerUidCounter#transact" am: a7db5ddda5 am: fe5e2742b6 am: 707437622a 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1821293

Change-Id: I30d748c01fa05f05a02ee5ef8bbc721fc32eafae
 2021-10-04 14:23:49 +00: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
1ba78e5f40 Merge "Increase timeouts for loopers" am: 2ed9b3dc70 am: b370da94ec am: b13c54fd94 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1844177

Change-Id: If59c8212bea518255d34ffd59cafe8976f30cf41
 2021-10-04 11:24:14 +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
9d6dfd2afe Merge "Add Override anntation for TetheringConnector.setPreferTestNetworks" am: 1503bdc297 am: 1f3515bb48 am: 9e24f96b5a 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1844178

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

Change-Id: I2fe9c251e694fa8493df2287d6c95125f401c17f
 2021-10-04 10:22:58 +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
c502fa51d4 Merge "Enable/disable FrameworksNetTests" am: d1ed1cb8b7 am: 045f47bc31 am: 3820c8b69c 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1843117

Change-Id: Ia6bee67074b9ecfe87a3ba11d16b0f7ff3b392c9
 2021-10-04 08:32:16 +00: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
Aaron Huang
d1ed1cb8b7 Merge "Enable/disable FrameworksNetTests" 2021-10-04 07:53:09 +00:00
Treehugger Robot
3fcefe8039 Merge "Updating formatting and text for per-app dumpsys" am: 7ece4bb71e am: 3a44ebe9a1 am: 388ae1444f 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1723618

Change-Id: Iaac0cb2ec69b2335759f10787a3698c636b11753
 2021-10-03 06:32:52 +00:00
Treehugger Robot
388ae1444f Merge "Updating formatting and text for per-app dumpsys" am: 7ece4bb71e am: 3a44ebe9a1 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1723618

Change-Id: I9f337cd566e780846c88042ba8edd277a205ebd0
 2021-10-03 06:23:17 +00:00
Treehugger Robot
3a44ebe9a1 Merge "Updating formatting and text for per-app dumpsys" am: 7ece4bb71e 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1723618

Change-Id: Id13fe82d772d51b935a86076b1b660f57b4f5032
 2021-10-03 06:11:23 +00:00
Treehugger Robot
7ece4bb71e Merge "Updating formatting and text for per-app dumpsys" 2021-10-03 05:53:26 +00:00
TreeHugger Robot
0a2d680a4d Merge "Ensure calling package name and uid are matched" into sc-qpr1-dev am: e93efb6f96 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15618365

Change-Id: I80aa5da33f8c4c5154a721ceec58852b6c2d42f1
 2021-10-01 14:21:16 +00:00
TreeHugger Robot
e93efb6f96 Merge "Ensure calling package name and uid are matched" into sc-qpr1-dev 2021-10-01 14:08:56 +00:00
Aaron Huang
1ed8affa72 Enable/disable FrameworksNetTests 
Currently, there are some test for classes that are not in
connectivity module. If the platform code has a new change
that the test depends on it, then the test cannot verify the
behavior since the change does not exist in module branch.

This change moves the test for non-module classes out of
FrameworksNetTestsLib so that it doesn't go into coverage tests.
Then add those tests to FrameworksNetTests and use a variable
to enable/disable FrameworksNetTests which could minimize merge
conflicts.

Bug: 201265286
Test: make FrameworksNetTests

Change-Id: Ia9669da2c4d79054710e7f4173bc960e3f77f45a
 2021-10-01 19:29:50 +08:00
Mark Chien
55af8a15e7 [automerger skipped] Merge "Use SettingsShim to hide different implementation in shim" am: 05fd386de8 -s ours am: 77c2e2ecb5 -s ours am: 6bff95320d -s ours 
am skip reason: Merged-In I3e7f6525e9776992bd96b17c132b749b12285bbd with SHA-1 dfa5697a70 is already in history

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

Change-Id: I8640983e6bbd03954f4d5cddf8977f56c6a28517
 2021-10-01 02:18:28 +00:00
paulhu
4ff57841d1 Add comment for not listening EXTERNAL_APPLICATIONS_UNAVAILABLE am: e7e02d7880 am: 3c811e1e55 am: 8c8d2ddbb8 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1826071

Change-Id: I782103f90420593a650f36c49d92c708d792353e
 2021-10-01 02:18:21 +00:00
Mark Chien
6bff95320d [automerger skipped] Merge "Use SettingsShim to hide different implementation in shim" am: 05fd386de8 -s ours am: 77c2e2ecb5 -s ours 
am skip reason: Merged-In I3e7f6525e9776992bd96b17c132b749b12285bbd with SHA-1 dfa5697a70 is already in history

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

Change-Id: Ifc7466160004853e7a6275bdea96449a2f8c30e3
 2021-10-01 02:03:30 +00:00
paulhu
8c8d2ddbb8 Add comment for not listening EXTERNAL_APPLICATIONS_UNAVAILABLE am: e7e02d7880 am: 3c811e1e55 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1826071

Change-Id: If268578d69566cf9548ed8ea184ee4947fffcdc3
 2021-10-01 02:03:26 +00:00
Mark Chien
77c2e2ecb5 [automerger skipped] Merge "Use SettingsShim to hide different implementation in shim" am: 05fd386de8 -s ours 
am skip reason: Merged-In I3e7f6525e9776992bd96b17c132b749b12285bbd with SHA-1 dfa5697a70 is already in history

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

Change-Id: Iee833c651c7c8e77d9b828eb8d0ead9a57ce513d
 2021-10-01 01:48:40 +00:00
paulhu
3c811e1e55 Add comment for not listening EXTERNAL_APPLICATIONS_UNAVAILABLE am: e7e02d7880 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1826071

Change-Id: Ib46d16e9d96ff331a486ec4151aa498236f29d8f
 2021-10-01 01:48:36 +00:00