Commit Graph

12800 Commits

Author SHA1 Message Date
Paul Hu
b43a0ed287 Merge "Add ConnectivitySettingsManager" am: 3e17e82ab1 am: af229a6c7b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1641759

Change-Id: Ie780e244374478d3e7bcd00cecbdfcb5edc600d6
2021-03-17 15:50:31 +00:00
Remi NGUYEN VAN
ec5b8f3b24 Merge "Remove Protocol.BASE_* usage in Connectivity" am: 7ffb87e4ce am: e4a8d2ff33
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1629266

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

Change-Id: I8bf8d6cc604d09b4bea0e46e9636a0387bc6041f
2021-03-17 15:50:00 +00:00
Paul Hu
af229a6c7b Merge "Add ConnectivitySettingsManager" am: 3e17e82ab1
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1641759

Change-Id: I84e3e2eb6f507abf6220b43886f6ab9e1fad4218
2021-03-17 15:27:02 +00:00
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
Paul Hu
3e17e82ab1 Merge "Add ConnectivitySettingsManager" 2021-03-17 14:57:32 +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
516d3b7c75 [automerger skipped] Merge "Remove extra comment" am: be83a4afc5 -s ours am: 3414a57e61 -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: Iefe558673fff3558f68d7e627ea55e64252d5ebd
2021-03-17 13:32:31 +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
Lucas Lin
388c821087 Merge "Modify the comment of getPrivateDnsMode" am: de9a3af4de am: e0e9636048
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640143

Change-Id: I89b6f26b1017173033be8f744bbf41683239e3e0
2021-03-17 12:35:08 +00:00
Remi NGUYEN VAN
9df643d6b6 Merge "Remove usage of networkAttributes" am: 5ccc21eb9b am: 5498465192
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623260

Change-Id: Iffc2da273156fc670834b809b06b5cfbb0c2c0ac
2021-03-17 12:34:48 +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
paulhu
1510c9c29f Add ConnectivitySettingsManager
This class is used to manager the connectivity module related
settings.

Bug: 182538166
Test: make
Change-Id: I5e02e719ce0d305d7c8a45fefb850d7b981f07eb
2021-03-17 18:24:16 +08:00
TreeHugger Robot
f0c45658c8 [automerger skipped] Merge changes I6ec246a6,If7eb8857,Id3d12b23,Ia52f9caf,I21028457, ... into rvc-dev am: 65eb4a4332 -s ours am: 01a59e4727 -s ours
am skip reason: skip tag Change-Id I6ec246a6a4e61f634956a165797fbb80296efd6a with SHA-1 8eef233b19 is already in history

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

Change-Id: I9ba0cda341b8d780c2d80c8fd84613bf558e1a8a
2021-03-17 09:34:28 +00:00
TreeHugger Robot
01a59e4727 [automerger skipped] Merge changes I6ec246a6,If7eb8857,Id3d12b23,Ia52f9caf,I21028457, ... into rvc-dev am: 65eb4a4332 -s ours
am skip reason: skip tag Change-Id I6ec246a6a4e61f634956a165797fbb80296efd6a with SHA-1 8eef233b19 is already in history

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

Change-Id: Idc7ec89ece0a688eb3adebc05822b526353e9e81
2021-03-17 08:56:39 +00:00
Lucas Lin
c6bd2f85e6 Merge "Change the parameter type from ContentResolver to Context" am: 8d638d9434 am: 8df3a6b774
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1639900

Change-Id: I8553f5723308825239a08127ccd5f1cd6f2432f8
2021-03-17 07:20:45 +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
Chalard Jean
2d82b40262 Merge changes I335e82e2,I84ba363d,I8f18083b,I854a952d,I00e23441 am: bf97a3ab5e am: ba22df4f9d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622621

Change-Id: Ib2ca97c31413c757be5babb6d65f6875f08e84dd
2021-03-17 07:01:21 +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
8248cbc3da Merge "Remove MessageUtils usage in VpnTransportInfo" am: 0b33d35188 am: e1aa50a18a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635041

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

Change-Id: I01d73266a4b4923ab098bfb6f50155d90b1effec
2021-03-17 01:42:30 +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
b77d000812 Merge "[VCN14] Expose registerBestMatchingNetworkCallback" am: 29908cf3c4 am: 789f3829a0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635047

Change-Id: I3882363a6c08372c2f50f209452123b50c7ec4e5
2021-03-16 23:55:13 +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
b56ee13b44 Merge "[VCN13] Implement tracking best matching network" am: f98037abb3 am: 4377c5d40c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1633519

Change-Id: I49f94fb997e770874e851afaa5266c6fd2ba1396
2021-03-16 17:17:08 +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
970d67d760 Merge "Replace interal okhttp APIs" am: e3ed08a24d am: c7b4df71f6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622669

Change-Id: I11df051ca4a32ab72b93cf0e7ebb21457e9a5196
2021-03-16 13:03:58 +00: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
Lucas Lin
cb2db75d6f Merge "Remove NETWORK_STACK_UID check" am: 5f7eb9024e am: f23bda53b2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635323

Change-Id: I82eec664bd11bfb713e52c08fc38dc49dec973c4
2021-03-16 12:44:29 +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