LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,478 Commits 2 Branches 0 Tags
3ce5c55680bbf5bb1d3fcb90245fde9dcf9920e9
Commit Graph

12478 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
James Mattis
3ce5c55680 Merge "Adding additional docs for OemNetworkPreferences" am: f13bcb0899 am: f2c389c4c5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1606593

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0a4cff353357a270f126a74d2648de755c64a6ee
 2021-03-03 19:04:06 +00:00
James Mattis
f2c389c4c5 Merge "Adding additional docs for OemNetworkPreferences" am: f13bcb0899 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1606593

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I947176ec2f71fcddb7bc432b23917eef219562f3
 2021-03-03 18:24:33 +00:00
James Mattis
f13bcb0899 Merge "Adding additional docs for OemNetworkPreferences" 2021-03-03 17:25:01 +00:00
Treehugger Robot
132b0dcbad Merge "Extend timeout for receiving broadcasts" am: 08ef7ddaff am: 04707731d3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614339

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I00c12a0b52948b8c2dd345b87e847c372e287571
 2021-03-03 08:55:28 +00:00
Lorenzo Colitti
12bbf1915e Merge changes Idfb5e149,Ia52b24c5 am: cfdaa84e64 am: 1505fe6152 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612040

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icc26e2bbf443eba7e8ef5d5b1cbc78f041cd1401
 2021-03-03 08:54:42 +00:00
Treehugger Robot
04707731d3 Merge "Extend timeout for receiving broadcasts" am: 08ef7ddaff 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614339

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I14924edf870ff55c334113f5d1583862be20e0f8
 2021-03-03 08:51:04 +00:00
Lorenzo Colitti
1505fe6152 Merge changes Idfb5e149,Ia52b24c5 am: cfdaa84e64 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612040

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0ea9aed0e6c626ab0076260dab6ff9f657a82a30
 2021-03-03 08:33:11 +00:00
Treehugger Robot
08ef7ddaff Merge "Extend timeout for receiving broadcasts" 2021-03-03 07:52:41 +00:00
Remi NGUYEN VAN
27ed37105b Extend timeout for receiving broadcasts 
The test is currently flaky as broadcasts can take a long time
to be delivered, often more than 500ms.
Extend the timeout for broadcasts to 30s.

Historically the test would wait for broadcasts for at most 500ms,
but not verify that they were received before proceeding. This was
fixed recently by adding an assertion, but the assertion needs to
give enough time for the broadcast to be received.

Bug: 173331190
Change-Id: I0760f3418c635aa4d68de5aefdb7120a9d3e930b
Test: atest FrameworksNetTests
 2021-03-03 06:26:16 +00:00
Lorenzo Colitti
cfdaa84e64 Merge changes Idfb5e149,Ia52b24c5 
* changes:
  Stop using NetworkState internally in ConnectivityService.
  Isolate an ad-hoc legacy API codepath.
 2021-03-03 05:35:28 +00:00
Frank Li
3ff134ee51 Merge "[REIP01]Remove the IP connectivty metrics" am: 2c1989a672 am: 737dd24aa0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607896

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idaa8aed7d02ea1fcf7f6046683c37bb23e153dab
 2021-03-03 02:17:26 +00:00
Paul Hu
cf2e3208f2 Merge "Use IDnsResolverUnsolicitedEventListener" am: 3503759a6f am: 3506a1b335 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542744

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iabcc9dc41b5e51920c7d67d89c90e1e2c7e3e45c
 2021-03-03 02:17:14 +00:00
Paul Hu
c847b5cc35 Merge "Implement Settings#checkAndNoteChangeNetworkStateOperation on CS" am: 3f250d1da0 am: d81c20011a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560476

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iad6f9e6cabc5f7eccd0aad020b398950f0495703
 2021-03-03 02:17:02 +00:00
Frank Li
737dd24aa0 Merge "[REIP01]Remove the IP connectivty metrics" am: 2c1989a672 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607896

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I23251128cb1576002b2b5e0642e9c274d071b7dd
 2021-03-03 01:43:25 +00:00
Paul Hu
3506a1b335 Merge "Use IDnsResolverUnsolicitedEventListener" am: 3503759a6f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542744

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idd84037196d9ee7140869e17a3082aad2bed7599
 2021-03-03 01:40:15 +00:00
Paul Hu
d81c20011a Merge "Implement Settings#checkAndNoteChangeNetworkStateOperation on CS" am: 3f250d1da0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560476

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4ad8f2d923e9415460c02002750a3766978272a6
 2021-03-03 01:34:48 +00:00
Frank Li
2c1989a672 Merge "[REIP01]Remove the IP connectivty metrics" 2021-03-03 01:28:31 +00:00
Paul Hu
3503759a6f Merge "Use IDnsResolverUnsolicitedEventListener" 2021-03-03 01:08:27 +00:00
Paul Hu
3f250d1da0 Merge "Implement Settings#checkAndNoteChangeNetworkStateOperation on CS" 2021-03-03 01:07:20 +00:00
Yan Yan
df431e094e Merge "Support new IpSecAlgorithm AUTH_AES_CMAC" am: ca72617385 am: 7d67dda5c3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579251

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8ab124e454f007c0330de636bc9e8b2729fcf4dd
 2021-03-02 21:29:39 +00:00
Yan Yan
7d67dda5c3 Merge "Support new IpSecAlgorithm AUTH_AES_CMAC" am: ca72617385 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1579251

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic9cc8508fb44e10371bc76bb31f20340f8663b18
 2021-03-02 21:08:15 +00:00
Treehugger Robot
2fd6d378c8 Merge "[FUI09] Expose NetworkStateSnapshot as system API" am: 7a593e640d am: d73af919b6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536708

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib59b32356b55200798c5e8c6f85174049b99770c
 2021-03-02 21:05:36 +00:00
Treehugger Robot
c92d0ab048 Merge "[FUI17] Migrate NetworkStatsService to use NetworkStateSnapshot" am: ebfdaa502f am: 15c7e774c2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556553

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5a804c1011080df3b09b01930817b5d0c46cef4a
 2021-03-02 21:05:02 +00:00
Treehugger Robot
d73af919b6 Merge "[FUI09] Expose NetworkStateSnapshot as system API" am: 7a593e640d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536708

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8eb6681328ad1f4a85bcc8c6c4b9446c23616b7a
 2021-03-02 20:52:02 +00:00
Treehugger Robot
15c7e774c2 Merge "[FUI17] Migrate NetworkStatsService to use NetworkStateSnapshot" am: ebfdaa502f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556553

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2b19538843007e38e170163120f38477e4b76be8
 2021-03-02 20:47:52 +00:00
Remi NGUYEN VAN
405b9a0f54 Merge "Move OemNetworkPreferences aidl to connectivity" am: d795b61a56 am: 695e5f6f62 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612038

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I91bc4b0463d092f59c3e5d2e59bc4704c336a710
 2021-03-02 20:44:00 +00:00
Remi NGUYEN VAN
f9e689aa17 Merge "Move UidRange to connectivity" am: ea3a01abf9 am: beb3822e20 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612295

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic05c10eca12c3c43190c767b4cef6ad88a0835f5
 2021-03-02 20:43:46 +00:00
Treehugger Robot
0de430ef26 Merge "Add modules-utils-os to service-connectivity" am: d55697b5e2 am: dec716d6d3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612195

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I173d225caf28c63a7cccbaf090c783775a6e01ec
 2021-03-02 20:42:46 +00:00
Treehugger Robot
090cc9ea64 Merge "Replace checkNetworkStackPermission in TestNetworkService" am: e7b360f9f5 am: 7afcfc90ee 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612194

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I279528bf95a7cf575dad9965eac627cd52e6cca8
 2021-03-02 20:34:45 +00:00
Remi NGUYEN VAN
695e5f6f62 Merge "Move OemNetworkPreferences aidl to connectivity" am: d795b61a56 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612038

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I11b9be22935b9fd7cf53b268103a1ce4635a6afd
 2021-03-02 20:27:29 +00:00
Remi NGUYEN VAN
beb3822e20 Merge "Move UidRange to connectivity" am: ea3a01abf9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612295

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I672615b0804b9a9de4befa1ba5aea2efb9c962df
 2021-03-02 20:24:20 +00:00
Treehugger Robot
dec716d6d3 Merge "Add modules-utils-os to service-connectivity" am: d55697b5e2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612195

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I22df4afec8f8b5024d099966c0ca0f78b55ff08a
 2021-03-02 20:19:24 +00:00
Treehugger Robot
7afcfc90ee Merge "Replace checkNetworkStackPermission in TestNetworkService" am: e7b360f9f5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612194

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5dd6577a57be2234014527e3bd517b60c4fecb48
 2021-03-02 20:16:39 +00:00
Remi NGUYEN VAN
f685f49896 Merge "Move Proxy, PacProxySelector out of Connectivity" am: 14bcef6a65 am: b7f911ad07 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1598157

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4cc62d59b1da5053a4af976e30d411d8f066bbcc
 2021-03-02 20:08:28 +00:00
Remi NGUYEN VAN
b7f911ad07 Merge "Move Proxy, PacProxySelector out of Connectivity" am: 14bcef6a65 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1598157

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id81273b33752ff353dfebdd2cd3faf43429f1a29
 2021-03-02 19:52:58 +00:00
Remi NGUYEN VAN
d0a8f0ab6e Merge "Move SocketUtils out of the connectivity module" am: 24e5bceac5 am: f0b2caa08b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1592273

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icb9911ad2933d76acbfc8b23463639ffc82bb58b
 2021-03-02 19:52:44 +00:00
Aaron Huang
2ba7d87ea7 Merge "Use the net-utils-device-common version of HexDump" am: 92e767c065 am: 600550be2f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607954

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieac67b40ce57391a614bd627ba8d3db931031760
 2021-03-02 19:52:05 +00:00
Lucas Lin
24b2a334d0 Merge changes I06ab0f2d,I8b146aa1 am: 22c42d573e am: cf985cf03e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596513

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieff3c3cc14319782e264ed9b4a287b5581e6da90
 2021-03-02 19:50:30 +00:00
Lucas Lin
de7ef4ab0b Merge changes I35ed84fc,Ie6cfd77b,I4e4f929f,I751526e8 am: 51d01615d3 am: 25d2ee9e66 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607733

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2f6682b86e1e8d9899ea02320dd8de347e72c724
 2021-03-02 19:49:13 +00:00
Remi NGUYEN VAN
f0b2caa08b Merge "Move SocketUtils out of the connectivity module" am: 24e5bceac5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1592273

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib2d4b5574ba710eb50c438144e2b87f6c8954336
 2021-03-02 19:48:26 +00:00
Aaron Huang
600550be2f Merge "Use the net-utils-device-common version of HexDump" am: 92e767c065 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607954

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1085391b5649df72b6664d5cdf1756c5110287dc
 2021-03-02 19:42:02 +00:00
Lucas Lin
cf985cf03e Merge changes I06ab0f2d,I8b146aa1 am: 22c42d573e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596513

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0332bf0bf07a0a958c2e75b464d577021fd57746
 2021-03-02 19:13:55 +00:00
Lucas Lin
25d2ee9e66 Merge changes I35ed84fc,Ie6cfd77b,I4e4f929f,I751526e8 am: 51d01615d3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607733

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia438f937106645eb0d6cb91772d437676bf716fd
 2021-03-02 19:08:57 +00:00
Remi NGUYEN VAN
fc31f05aba Merge "Move QoS API classes to Connectivity" am: 32a606fe54 am: c02f9028be 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1611876

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I774c494d6e0f136547cf9175abb6662fd106a6a3
 2021-03-02 18:46:39 +00:00
Yan Yan
ca72617385 Merge "Support new IpSecAlgorithm AUTH_AES_CMAC" 2021-03-02 18:24:27 +00:00
Treehugger Robot
7a593e640d Merge "[FUI09] Expose NetworkStateSnapshot as system API" 2021-03-02 16:08:03 +00:00
Lorenzo Colitti
cb1d6a17bc Stop using NetworkState internally in ConnectivityService. 
NetworkState is used by many methods that take or return legacy
network types. It is used because it contains most of the state
related to a network.

This code is not easy to follow and is more expensive than it
needs to be: most of the methods that construct a NetworkState
only really need one of its members (e.g., LinkProperties, or
NetworkInfo), but constructing a NetworkState requires making
defensive copies of all its other members as well.

- Instead of using NetworkState, use NetworkAgentInfo, which
  already contains all the same data.
- Replace calls to getUnfilteredActiveNetworkState with calls to
  getNetworkAgentInfoForUid. When getUnfilteredActiveNetworkState
  returned NetworkState.EMPTY, return a null nai, which causes
  any caller to see return null LinkProperties/NetworkInfo/etc.
- Rename filterNetworkStateForUid to getFilteredNetworkInfo,
  because that's the only thing it actually filters.
- Rename getFilteredNetworkInfo to getFilteredNetworkInfoForType
  to avoid having two methods with the same name perform two
  different operations. That method was only introduced recently
  in aosp/1552503, so it's probably fine to rename it.

Bug: 174123988
Test: passes existing ConnectivityServiceTest
Change-Id: Idfb5e149967266a442b268de6f13a521884dbb8f
 2021-03-03 01:02:45 +09:00
Lorenzo Colitti
998a02f226 Isolate an ad-hoc legacy API codepath. 
The legacy API getNetworkInfo(int type) is expected to return
NetworkInfo objects for all network types supported by the device
even when those network types are not connected.

This requires a lot of fabrication because all the data
structures in ConnectivityService store information about
connected networks, not networks that don't exist.

Worse, the current behaviour is to return BLOCKED instead of
DISCONNECTED if background data is restricted. This obviously
makes no sense, because a disconnected network cannot be
blocked, and because if that network type did connect and was
unmetered (e.g., Wi-Fi), it would no longer be BLOCKED.
This complicates the code, forcing several methods to deal with
a special case of null NetworkCapabilities, no NetworkAgentInfo,
etc.

Fix this by isolating this outlandish behaviour to its own
method. This allows the main codepaths not to have to support
this unusual and not very useful edge case.

Bug: 174123988
Test: pure refactoring, passes existing tests
Change-Id: Ia52b24c59024c8f6e63e584b864e0225cb572090
 2021-03-03 01:02:35 +09:00
junyulai
c6e8355dbd [FUI09] Expose NetworkStateSnapshot as system API 
This is needed by NetworkStatsService and
NetworkPolicyManagerService to utilize the snapshots of
information of networks that grabbed from ConnectivityService.

Test: atest FrameworksNetTests NetworkPolicyManagerServiceTest
Bug: 174123988
Change-Id: I7e974ef7b23ba9ba6ee775eed9899b0c0e2eca55
 2021-03-02 23:09:16 +08:00
Treehugger Robot
ebfdaa502f Merge "[FUI17] Migrate NetworkStatsService to use NetworkStateSnapshot" 2021-03-02 13:21:32 +00:00