Commit Graph

12762 Commits

Author SHA1 Message Date
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
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
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
Lucas Lin
8885169a2e Merge "Add comments to describe the value of converting hex to decimal" am: 26f778d2bd am: dc6444c414
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635221

Change-Id: I200d8ccb606e3bf440aaba0a875097b56b79a0c6
2021-03-16 09:45:35 +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
9ecf4d330b Merge "Have a new API to get private DNS mode" am: 11a286c9b5 am: eafa4097bd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620860

Change-Id: I5441212823663f02d20cecfbfdba126c8ed6e0de
2021-03-16 08:46:31 +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
Chalard Jean
a73e64726f Merge "[NS01] Add NetworkScore" am: 98de10a7a1 am: 18294fcbb3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556099

Change-Id: I3fede24f8b38222d259f42e86ac27962ca687fb4
2021-03-16 07:08:25 +00:00
Remi NGUYEN VAN
40078d1567 Merge "Add ParseException constructors to API" am: ef7b38b334 am: 2299e83d12
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635044

Change-Id: If6c7a232857a801ea5872c3beeba90d426a72d5a
2021-03-16 07:08:04 +00: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
19e5014a61 Merge "Create ServiceConnectivityResources" am: eb46aa1c58 am: 4df498eb9a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620871

Change-Id: Ia7855ef7125726ecec0c4509b5026aeb5621cd3d
2021-03-16 03:50:47 +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
35667ce499 Merge "Call clearCallingIdentity when calling registerNetworkProvider in TNS" am: 85bea4887f am: 3e0314d68f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635045

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6edda160620b4a3cbcf85f21081a41d959cf3173
2021-03-15 14:24:34 +00: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
Lorenzo Colitti
85bea4887f Merge "Call clearCallingIdentity when calling registerNetworkProvider in TNS" 2021-03-15 13:09:14 +00:00