Commit Graph

12509 Commits

Author SHA1 Message Date
Remi NGUYEN VAN
e4a8d2ff33 Merge "Remove Protocol.BASE_* usage in Connectivity" am: 7ffb87e4ce
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1629266

Change-Id: Ieca69d4ff1d2a7f3b369bb4dcabaa702fbab4594
2021-03-17 15:19:31 +00:00
Paul Hu
f3ba1620ea Merge "Remove Settings.Global.TCP_DEFAULT_INIT_RWND on CS" am: 3d136c56ca
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635043

Change-Id: Ia8fa547044f9674b1c465606e43c346ba0bc7c0e
2021-03-17 15:14:21 +00:00
Remi NGUYEN VAN
7ffb87e4ce Merge "Remove Protocol.BASE_* usage in Connectivity" 2021-03-17 14:53:26 +00:00
Paul Hu
3d136c56ca Merge "Remove Settings.Global.TCP_DEFAULT_INIT_RWND on CS" 2021-03-17 14:44:17 +00:00
Remi NGUYEN VAN
3414a57e61 [automerger skipped] Merge "Remove extra comment" am: be83a4afc5 -s ours
am skip reason: skip tag Change-Id I7432fe4c87cd3cab04dcb6185c9a4f3f84376549 with SHA-1 d2107994d6 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1641959

Change-Id: Ifd4bbb99c60e9d538fc87d5015dc2b0f7af4d125
2021-03-17 12:54:22 +00:00
Remi NGUYEN VAN
be83a4afc5 Merge "Remove extra comment" 2021-03-17 12:16:09 +00:00
Remi NGUYEN VAN
a711b3f96c Remove Protocol.BASE_* usage in Connectivity
ConnectivityManager and NetworkAgent do not share their handler with any
other component, so there is no reason to use addresses that do not
overlap. Protocol.BASE_* was written to allow for interaction "between
different StateMachine implementations without a conflict", but the
classes do not use StateMachine, and they do not have such interactions.

Bug: 177046265
Test: atest FrameworksNetTests
Change-Id: I18c341d4a2c01cb9559d682a9ad1ff259e6b5855
2021-03-17 20:56:50 +09:00
Lucas Lin
e0e9636048 Merge "Modify the comment of getPrivateDnsMode" am: de9a3af4de
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640143

Change-Id: I46131b18e8e09d1c2b7a0b3fe5913511942b7096
2021-03-17 11:54:29 +00:00
Remi NGUYEN VAN
5498465192 Merge "Remove usage of networkAttributes" am: 5ccc21eb9b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623260

Change-Id: I52a3125843e093c5a7d0d80c2a5c9608b397ea00
2021-03-17 11:51:17 +00:00
Lucas Lin
de9a3af4de Merge "Modify the comment of getPrivateDnsMode" 2021-03-17 11:25:18 +00:00
Remi NGUYEN VAN
5ccc21eb9b Merge "Remove usage of networkAttributes" 2021-03-17 11:24:28 +00:00
paulhu
0620c858ae Remove Settings.Global.TCP_DEFAULT_INIT_RWND on CS
TCP_DEFAULT_INIT_RWND setting has never been set before, CS
always read the tcp receive window size from
net.tcp.default_init_rwnd then set to net.tcp_def_init_rwnd.
Thus, remove the unnecessary setting from CS, and the property
doesn't need to set either. Because aosp/1639922 migrate the
properties, the default value has been set to kernel already.

Bug: 182538166
Test: atest FrameworksNetTests
Change-Id: I13e175ab4dea72446af7df4a25e307e5934fa813
2021-03-17 11:14:35 +00:00
Remi NGUYEN VAN
eade234e2a Remove extra comment
This fixes a merge conflict with downstream branches due to an
incomplete cherry-pick.

Bug: 171540887
Test: m

Change-Id: I27a8f20f1a1d83b472700648f3f5a68413a76ac3
Merged-In: I7432fe4c87cd3cab04dcb6185c9a4f3f84376549
2021-03-17 10:58:08 +00:00
Lucas Lin
8df3a6b774 Merge "Change the parameter type from ContentResolver to Context" am: 8d638d9434
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1639900

Change-Id: I6a91019bf0b10175885d146e77f98533ad702f8c
2021-03-17 07:02:18 +00:00
lucaslin
73c9860a06 Modify the comment of getPrivateDnsMode
Bug: 172183305
Test: m
Change-Id: I2f1b44cf2a362b42f052ea5d34a5cec03d46e661
2021-03-17 14:53:35 +08:00
Lucas Lin
8d638d9434 Merge "Change the parameter type from ContentResolver to Context" 2021-03-17 06:35:21 +00:00
Chalard Jean
ba22df4f9d Merge changes I335e82e2,I84ba363d,I8f18083b,I854a952d,I00e23441 am: bf97a3ab5e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622621

Change-Id: I641df2f25ba989af597952a03488c817c82323c2
2021-03-17 06:21:55 +00:00
Chalard Jean
bf97a3ab5e Merge changes I335e82e2,I84ba363d,I8f18083b,I854a952d,I00e23441
* changes:
  Remove per-user preference when the user is removed
  Expose the enterprise per-profile networking API.
  Implement setNetworkPreferenceForUser.
  Public API for per-profile network preference.
  Add tests for setNetworkPreferenceForUser
2021-03-17 05:48:18 +00:00
Remi NGUYEN VAN
e1aa50a18a Merge "Remove MessageUtils usage in VpnTransportInfo" am: 0b33d35188
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635041

Change-Id: If3c85705ecc0d27b9d365b302378329637474a80
2021-03-17 01:04:06 +00:00
Remi NGUYEN VAN
eccbb61f58 Merge "Move LocationPermissionChecker to libs/net" am: 6dde6eceab
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1618840

Change-Id: I1341ba5c6396f734d6ae081c722a1844b0140373
2021-03-17 01:00:46 +00:00
Remi NGUYEN VAN
0b33d35188 Merge "Remove MessageUtils usage in VpnTransportInfo" 2021-03-17 00:14:10 +00:00
Remi NGUYEN VAN
6dde6eceab Merge "Move LocationPermissionChecker to libs/net" 2021-03-17 00:13:21 +00:00
Junyu Lai
789f3829a0 Merge "[VCN14] Expose registerBestMatchingNetworkCallback" am: 29908cf3c4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635047

Change-Id: I4d475e1a681473c244afe4d3eaaabbcfaa9af9d6
2021-03-16 23:43:07 +00:00
Junyu Lai
4377c5d40c Merge "[VCN13] Implement tracking best matching network" am: f98037abb3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1633519

Change-Id: I58da6ebe747fe05609d9937814f4d47834418964
2021-03-16 16:39:41 +00:00
junyulai
bd62226850 [VCN14] Expose registerBestMatchingNetworkCallback
Test: m -j doc-comment-check-docs
Bug: 175662146
Change-Id: Ie67dd2f4f8d973de37bc64a03908d7cbb7c2b7ad
2021-03-16 21:30:56 +08:00
junyulai
8cae3c748f [VCN13] Implement tracking best matching network
This is done by:
  1. In requestNetwork, provide a basic permission check.
  2. rematchNetworksAndRequests: no change, since non listen
     requests will be automatically processed to track
     best satisfying network.
  3. applyNetworkReassignment: no change, since non-request
     will not be sent to factories.

Test: atest ConnectivityServiceTest#testRegisterBestMatchingNetworkCallback_noIssueToFactory
Test: atest ConnectivityServiceTest#testRegisterBestMatchingNetworkCallback_trackBestNetwork
Bug: 175662146
Change-Id: I8cf4ab334df6812d84cdda160e9b72b6f54062af
2021-03-16 21:30:55 +08:00
Paul Hu
c7b4df71f6 Merge "Replace interal okhttp APIs" am: e3ed08a24d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622669

Change-Id: I9f4e11b6e2ed2c5c09d7ea38e885de7186871edf
2021-03-16 12:44:35 +00:00
Paul Hu
e3ed08a24d Merge "Replace interal okhttp APIs" 2021-03-16 12:18:49 +00:00
Chalard Jean
6bb468c476 Remove per-user preference when the user is removed
Test: new test for this
Change-Id: I335e82e29ec8f4c8da9def8b40153858cfd5bacb
2021-03-16 12:14:12 +00:00
Chalard Jean
cc9ad15cd2 Expose the enterprise per-profile networking API.
Also unify the listener for Oem settings, which have
never been released as public API (it is slated to be
released in S).

Test: FrameworksNetTests
Change-Id: I84ba363dd0ec03871c37b1c3a31e5557d9aa12e7
2021-03-16 12:14:00 +00:00
Chalard Jean
9d96818bf2 Implement setNetworkPreferenceForUser.
Test: FrameworksNetTests
Change-Id: I8f18083b5857289892fe8adea5f5ea3f5dbe0809
2021-03-16 12:13:46 +00:00
Chalard Jean
03433057cb Public API for per-profile network preference.
This patch defines the API, but does not make it public
yet as there is no implementation yet.

Test: none so far
Change-Id: I854a952dfe35cc80847eb62f522b1667b8e9b8a0
2021-03-16 12:13:27 +00:00
Chalard Jean
38a4e7fb76 Add tests for setNetworkPreferenceForUser
Test: this
Change-Id: I00e2344118408da307439a0a993eb67cb17bf777
2021-03-16 12:11:27 +00:00
Lucas Lin
f23bda53b2 Merge "Remove NETWORK_STACK_UID check" am: 5f7eb9024e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635323

Change-Id: I5ae4b49d3168e48ccd6b61ee349ae89041e3de05
2021-03-16 12:06:10 +00:00
Lucas Lin
5f7eb9024e Merge "Remove NETWORK_STACK_UID check" 2021-03-16 11:26:24 +00:00
lucaslin
1162662032 Change the parameter type from ContentResolver to Context
Context is more useful than ContentResolver, it can provide more
information if we want to change the behavior in the future.

Bug: 172183305
Test: atest FrameworksNetTests
Change-Id: I5702c7d74b862a76558b94f1abe2c6df9eb7f097
Merged-In: I5702c7d74b862a76558b94f1abe2c6df9eb7f097
2021-03-16 09:26:57 +00:00
lucaslin
2d72a13e60 Remove NETWORK_STACK_UID check
NETWORK_STACK_UID check was introduced by aosp/1134635, and it
assumed that wifi factories/agents will be running on the network
stack process, but it didn't eventually. It runs in the system
server instead. So remove this check.

Bug: 170598012
Test: atest FrameworksNetTests
Change-Id: Ie11268738e364e252f18876f7a4a0dc064ca8b9c
2021-03-16 09:16:38 +00:00
Lucas Lin
dc6444c414 Merge "Add comments to describe the value of converting hex to decimal" am: 26f778d2bd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635221

Change-Id: Id012600c0f06b25c90598543a20673e6f515bf29
2021-03-16 09:05:38 +00:00
Lucas Lin
26f778d2bd Merge "Add comments to describe the value of converting hex to decimal" 2021-03-16 08:31:10 +00:00
Lucas Lin
eafa4097bd Merge "Have a new API to get private DNS mode" am: 11a286c9b5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620860

Change-Id: I2600965b38f3039c0cca1c39d294ad9665aeab17
2021-03-16 08:06:35 +00:00
Lucas Lin
11a286c9b5 Merge "Have a new API to get private DNS mode" 2021-03-16 07:39:35 +00:00
Remi NGUYEN VAN
9f9922813f Remove usage of networkAttributes
networkAttributes is a legacy configuration that is now only used to
configure which legacy type networks are supported, and what the restore
timer is for that network type, for the deprecated
startUsingNetworkFeature API.

Use a dedicated resource for the restore timers, and build supported
legacy network types using hasSystemFeature for wifi, wifi p2p,
bluetooth, proxy types, and TelephonyManager.isDataCapable for the
mobile types.

Bug: 146206136
Test: atest FrameworksNetTests
Change-Id: I3a771d3de6c5e912f18d2834e3a50af797ac4991
2021-03-16 16:01:40 +09:00
Chalard Jean
18294fcbb3 Merge "[NS01] Add NetworkScore" am: 98de10a7a1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556099

Change-Id: I71f1937ffd099283d7f753b843d4cf2a771fe22b
2021-03-16 06:53:52 +00:00
Remi NGUYEN VAN
2299e83d12 Merge "Add ParseException constructors to API" am: ef7b38b334
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635044

Change-Id: I2eca0681d3a94da26307663d56975327bbd06c6a
2021-03-16 06:49:08 +00:00
Chalard Jean
98de10a7a1 Merge "[NS01] Add NetworkScore" 2021-03-16 06:36:07 +00:00
Remi NGUYEN VAN
ef7b38b334 Merge "Add ParseException constructors to API" 2021-03-16 06:25:16 +00:00
Remi NGUYEN VAN
4df498eb9a Merge "Create ServiceConnectivityResources" am: eb46aa1c58
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620871

Change-Id: I91fb801ef2edf64fcaaf082f57eaadb3e7612efa
2021-03-16 03:11:25 +00:00
Remi NGUYEN VAN
eb46aa1c58 Merge "Create ServiceConnectivityResources" 2021-03-16 02:29:31 +00:00
paulhu
e5852fbc9a Replace interal okhttp APIs
Connectivity is becoming a mainline module in S but mainline
modules are not allowed to use non-formal APIs. Thus, replace
internal okhttp APIs to stable libcore APIs which are created for
using HttpURLConnectionFactory.

Bug: 182238821
Test: atest FrameworksNetTests
Change-Id: I56ba1b9e6e94f9c6519c3f1c8f0c5993fccbe185
2021-03-15 23:06:15 +08:00
Lorenzo Colitti
3e0314d68f Merge "Call clearCallingIdentity when calling registerNetworkProvider in TNS" am: 85bea4887f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635045

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie0ca67f38da9d4a70911485d2630fe8bae4cbdfa
2021-03-15 13:48:39 +00:00