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

43165 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Mark Chien
05fd386de8 Merge "Use SettingsShim to hide different implementation in shim" 2021-10-01 01:47:00 +00:00
paulhu
e7e02d7880 Add comment for not listening EXTERNAL_APPLICATIONS_UNAVAILABLE 
Bug: 192653840
Test: only add comment.
Change-Id: I5a61ea76a40cf74e15ec36e415d6d4eb8ef6016f
 2021-10-01 01:30:31 +00:00
Chiachang Wang
1adf3d8224 Merge "Restore private dns host name after testing" am: 0ee7406d33 am: d2bd93f2e2 am: 3685f8334a 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1836114

Change-Id: Ia3c8d6fcfdabf4d5cfc0791d4b23b46280440302
 2021-10-01 01:18:37 +00:00
Chiachang Wang
1e2e466998 Merge "Remove reference when active listener is unregistered" am: a39b107812 am: e129460c46 am: ff64eaee16 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1833145

Change-Id: I3beb653f02b63854412b8655a6d723350fc80dd4
 2021-10-01 01:18:32 +00:00
Chiachang Wang
3685f8334a Merge "Restore private dns host name after testing" am: 0ee7406d33 am: d2bd93f2e2 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1836114

Change-Id: Id7ff1f589915f3dadd1dd6b66876a0a4daa90a68
 2021-10-01 01:09:56 +00:00
Chiachang Wang
ff64eaee16 Merge "Remove reference when active listener is unregistered" am: a39b107812 am: e129460c46 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1833145

Change-Id: Iefe5025f40f2ed9f1fc4b5b75e3dc0b9e599f6b5
 2021-10-01 01:09:52 +00:00
Chiachang Wang
d2bd93f2e2 Merge "Restore private dns host name after testing" am: 0ee7406d33 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1836114

Change-Id: I51344c514278433e66016a812e1458e5e2df0e8d
 2021-10-01 00:54:23 +00:00
Chiachang Wang
e129460c46 Merge "Remove reference when active listener is unregistered" am: a39b107812 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1833145

Change-Id: I7b05b33c2a0c02c298d42ab4891ce543fe5ab9bd
 2021-10-01 00:54:16 +00:00
Chiachang Wang
0ee7406d33 Merge "Restore private dns host name after testing" 2021-10-01 00:37:15 +00:00
Chiachang Wang
a39b107812 Merge "Remove reference when active listener is unregistered" 2021-10-01 00:37:00 +00:00
James Mattis
8b298a00b2 Updating formatting and text for per-app dumpsys 
Fixing the indentation for dumpsys CONNECTIVITY for per app network
info. Also updated to more clearly show when the active network is
currently tagged to the "no service network" for configured apps so as
to more clearly show intent to dumpsys consumers. Finally, correctly
showing profile network preferences which weren't being shown
previously.

Prior formatting with no per-app networks:
Current per-app default networks: Per-App Network Preference:
    none

Updated formatting with no per-app networks:
Current network preferences:
  Default requests:

Prior formatting with active per-app networks ("none" is shown in this
case since profile network preferences weren't correctly displayed):
Current per-app default networks: Per-App Network Preference:
    none
  Is per-app network active:
    true
    Active network: 100
    Tracked UIDs:
      {1100000-1199999}

Updated formatting with active per-app networks:
Current network preferences:
  Profile preferences:
    [[ProfileNetworkPreference user=UserHandle{11} caps=[ Capabilities:
    INTERNET&TRUSTED&NOT_VCN_MANAGED&ENTERPRISE Uids:
    <{1100000-1199999}>]]]
  OEM preferences:
    OemNetworkPreferences{mNetworkMappings={android.net.cts=-1}}
  Mobile data preferred UIDs:
    mMobileDataPreferredUids: {1, 2, 3}
  Default requests:
    Request: [uid/pid:1000/1423] - Satisfier: [100] Preference order: 10
    Tracked UIDs:{1100000-1199999}

Bug: 189860802
Test: adb shell dumpsys connectivity
Change-Id: I5ed4bb83e9e5a4497f5019ab4e4c0f238989a246
 2021-09-30 11:47:36 -07:00
markchien
becdc2a64d Move runDhcp to TetheringTester am: f320c21120 am: 97ac1a93fa am: ef9eb6af99 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1817921

Change-Id: I2fb3812afc40bc8c2d2e6d5286cc778c57da2701
 2021-09-30 15:36:22 +00:00
markchien
ef9eb6af99 Move runDhcp to TetheringTester am: f320c21120 am: 97ac1a93fa 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1817921

Change-Id: Ia42c6f524c229c29ad3f7d0caf16f2f5c931a7dd
 2021-09-30 15:14:44 +00:00
markchien
97ac1a93fa Move runDhcp to TetheringTester am: f320c21120 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1817921

Change-Id: I74d5c4a6c88fb26e35218f05ef468fa125a340d4
 2021-09-30 15:00:11 +00:00
markchien
b94c515370 Use SettingsShim to hide different implementation in shim 
TetheringService call different Settings API to check write settings
permission between R and S.

Bug: 182211575
Test: install S module to R device and both run mts tests build with S
and R.

Change-Id: I3e7f6525e9776992bd96b17c132b749b12285bbd
Merged-In: I3e7f6525e9776992bd96b17c132b749b12285bbd
 2021-09-30 21:42:23 +08:00
markchien
dea69941a9 Rename mTapPacketReader to mDowntreamReader am: 0bd10760a8 am: 7ea99be9d6 am: 4a96283c13 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1824633

Change-Id: Ia94f0340e86c93b1d4c7330206df424428f53f83
 2021-09-30 13:15:00 +00:00
Mark Chien
3e1e57285a Merge "Support set test network to tethering upstream" am: 473d864d20 am: da862b2a35 am: 97f9de1efd 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1797991

Change-Id: Ia6e33d18fe80c333d07c65a03f12c11fa0203d17
 2021-09-30 13:14:56 +00:00
markchien
4a96283c13 Rename mTapPacketReader to mDowntreamReader am: 0bd10760a8 am: 7ea99be9d6 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1824633

Change-Id: I1c707fdc5f31401ade7d7dec061d47a9e99226d9
 2021-09-30 13:01:05 +00:00
Mark Chien
97f9de1efd Merge "Support set test network to tethering upstream" am: 473d864d20 am: da862b2a35 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1797991

Change-Id: I90a61dfbd9809ab25f182bddf2a9c2bd116a401a
 2021-09-30 13:00:58 +00:00
markchien
f320c21120 Move runDhcp to TetheringTester 
This is a no-op CL which add TetheringTester and move runDhcp related
logic to it.

Test: atest EthernetTetheringTest
Change-Id: Ib1c5647b2bd5a1b27c976450d3aa265aff8f5b70
 2021-09-30 12:57:30 +00:00
markchien
7ea99be9d6 Rename mTapPacketReader to mDowntreamReader am: 0bd10760a8 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1824633

Change-Id: I1cde888d4502463bbd6d49a3b76f3f8a6d676483
 2021-09-30 12:48:20 +00:00
Mark Chien
da862b2a35 Merge "Support set test network to tethering upstream" am: 473d864d20 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1797991

Change-Id: Ifd5c76a943886dfe55e9b68eeb77931dae6fe204
 2021-09-30 12:48:15 +00:00
Chiachang Wang
43fece15b9 Merge "Add test for CM#[add|remove]DefaultNetworkActiveListener" am: 2086865010 am: c345dec57b am: 022795b778 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1827918

Change-Id: I5ae35e0747a15c030053df71c6dd066ee5b3c935
 2021-09-30 12:43:12 +00:00