Lucas Lin
5671c0fea4
[automerger skipped] Merge "Change the parameter type from ContentResolver to Context" am: 253a041a13 am: 47984f7022 am: 33f340b54a -s ours
...
am skip reason: skip tag Change-Id I5702c7d74b862a76558b94f1abe2c6df9eb7f097 with SHA-1 2a4c17c3b3 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1639900
Change-Id: Id713c440298bb0c410fbba74cb62550e1d5f90e9
2021-03-17 22:13:33 +00:00
Chalard Jean
0f15b90f34
Merge changes I335e82e2,I84ba363d,I8f18083b,I854a952d,I00e23441 am: 24a9b5cad6 am: 1f51df82b1 am: 35b284e0ff
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622621
Change-Id: I5fa8e7b8bf35a5464868fdca4d115b3f9132c65f
2021-03-17 22:13:06 +00:00
Remi NGUYEN VAN
7f22e754de
Merge "Remove MessageUtils usage in VpnTransportInfo" am: 4ad3ac7de6 am: d7bd61b340 am: bdaef78b90
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635041
Change-Id: Ibf1592220cedb387d8edba27a7bbe49a36f42dc0
2021-03-17 22:10:16 +00:00
Junyu Lai
88ee4f1d03
Merge "[VCN14] Expose registerBestMatchingNetworkCallback" am: 29908cf3c4 am: 96e1290b7a am: 71bc2b560d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635047
Change-Id: Ic0cb87f3ac4e9df7b0b6e2d0344c43e66499900e
2021-03-17 22:08:56 +00:00
Junyu Lai
b4d8384170
Merge "[VCN13] Implement tracking best matching network" am: f98037abb3 am: 67a2b3eb30 am: 14865c4e07
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1633519
Change-Id: Ie252014cd9047c27fad3e451b80047493935dc3d
2021-03-17 16:08:50 +00:00
Paul Hu
4d39725b04
Merge "Replace interal okhttp APIs" am: 4fe7ff8d1f am: 7bd3aa2a13 am: 542786989d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622669
Change-Id: Ida687a8987385ef4525e41e609d7c8fedda9f1da
2021-03-17 16:07:31 +00:00
Lucas Lin
76c10401b5
Merge "Add comments to describe the value of converting hex to decimal" am: 3453ec5024 am: 3fa2c3e87a am: 172cce09da
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635221
Change-Id: I0f978fd5fa0283a40db2897478483d680d44e9e9
2021-03-17 16:05:47 +00:00
Lucas Lin
f6ba0a741c
[automerger skipped] Merge "Have a new API to get private DNS mode" am: b79ae17835 am: 0839a2791b am: 3373b94c0d -s ours
...
am skip reason: skip tag Change-Id I02a1e91b4eafb5f5df3eada1c07b99849a050c3c with SHA-1 180f44f0f2 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620860
Change-Id: I45f348a3d0105f07441c8aabc226a12ee6a9e89c
2021-03-17 16:05:23 +00:00
Chalard Jean
7f2fddf60e
Merge "[NS01] Add NetworkScore" am: 2a9450c234 am: c8aa29e41e am: 2d07595731
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556099
Change-Id: I953a773f8914152578a98d71b43d0a2e30a51aba
2021-03-17 16:04:22 +00:00
Remi NGUYEN VAN
fa39a26f93
Merge "Add ParseException constructors to API" am: a10ea9b5ee am: ff2bca11b2 am: a375a561a3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635044
Change-Id: I4e4b1f4a70fcfaa43fa9b612e7fbd151093fd8fe
2021-03-17 16:03:23 +00:00
Remi NGUYEN VAN
78c6f60e6d
[automerger skipped] Merge "Create ServiceConnectivityResources" am: d9d976f8f5 am: 33674f408b am: 1154393902 -s ours
...
am skip reason: skip tag Change-Id I77ac6f4303c54acc96f16e18ef02add30298ff3d with SHA-1 56520566ce is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620871
Change-Id: I95598f3c3fae16b5d2ec5dd314530649aee5e9b6
2021-03-17 16:02:18 +00:00
Lucas Lin
47984f7022
Merge "Change the parameter type from ContentResolver to Context" am: 253a041a13
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1639900
Change-Id: I6a91019bf0b10175885d146e77f98533ad702f8c
2021-03-17 07:02:18 +00:00
Lucas Lin
253a041a13
Merge "Change the parameter type from ContentResolver to Context"
2021-03-17 06:35:21 +00:00
Chalard Jean
1f51df82b1
Merge changes I335e82e2,I84ba363d,I8f18083b,I854a952d,I00e23441 am: 24a9b5cad6
...
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
24a9b5cad6
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
Lucas Lin
7b2feb74bc
Merge "Change the parameter type from ContentResolver to Context" into sc-dev
2021-03-17 03:27:28 +00:00
Remi NGUYEN VAN
d7bd61b340
Merge "Remove MessageUtils usage in VpnTransportInfo" am: 4ad3ac7de6
...
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
4ad3ac7de6
Merge "Remove MessageUtils usage in VpnTransportInfo"
2021-03-17 00:14:10 +00:00
Junyu Lai
96e1290b7a
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
67a2b3eb30
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
bd1230675e
[VCN14] Expose registerBestMatchingNetworkCallback
...
Test: m -j doc-comment-check-docs
Bug: 175662146
Change-Id: Ie67dd2f4f8d973de37bc64a03908d7cbb7c2b7ad
2021-03-16 21:30:56 +08:00
junyulai
7664f62d37
[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
7bd3aa2a13
Merge "Replace interal okhttp APIs" am: 4fe7ff8d1f
...
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
4fe7ff8d1f
Merge "Replace interal okhttp APIs"
2021-03-16 12:18:49 +00:00
Chalard Jean
0a4aefcec2
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
76b0c7efda
Implement setNetworkPreferenceForUser.
...
Test: FrameworksNetTests
Change-Id: I8f18083b5857289892fe8adea5f5ea3f5dbe0809
2021-03-16 12:13:46 +00:00
Chalard Jean
ad565e26d9
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
lucaslin
e2cd02d9ab
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
2a4c17c3b3
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
2021-03-16 17:25:28 +08:00
Lucas Lin
3fa2c3e87a
Merge "Add comments to describe the value of converting hex to decimal" am: 3453ec5024
...
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
3453ec5024
Merge "Add comments to describe the value of converting hex to decimal"
2021-03-16 08:31:10 +00:00
Lucas Lin
0839a2791b
Merge "Have a new API to get private DNS mode" am: b79ae17835
...
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
b79ae17835
Merge "Have a new API to get private DNS mode"
2021-03-16 07:39:35 +00:00
Chalard Jean
c8aa29e41e
Merge "[NS01] Add NetworkScore" am: 2a9450c234
...
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
ff2bca11b2
Merge "Add ParseException constructors to API" am: a10ea9b5ee
...
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
2a9450c234
Merge "[NS01] Add NetworkScore"
2021-03-16 06:36:07 +00:00
Remi NGUYEN VAN
a10ea9b5ee
Merge "Add ParseException constructors to API"
2021-03-16 06:25:16 +00:00
Remi NGUYEN VAN
33674f408b
Merge "Create ServiceConnectivityResources" am: d9d976f8f5
...
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
d9d976f8f5
Merge "Create ServiceConnectivityResources"
2021-03-16 02:29:31 +00:00
paulhu
ffc4077333
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
Aaron Huang
4b86da1a15
Merge changes from topic "pacproxy-service" am: 87c4904ab2 am: f0392a4704 am: ce43593e5e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553959
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If6d34753e8bf9201e16121b8f3c6c83aa6358986
2021-03-15 12:56:09 +00:00
Aaron Huang
f0392a4704
Merge changes from topic "pacproxy-service" am: 87c4904ab2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1553959
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I29e9e324f25e584d645900f83d31a00a4e151cbb
2021-03-15 12:12:48 +00:00
Aaron Huang
87c4904ab2
Merge changes from topic "pacproxy-service"
...
* changes:
Make PacProxyService be a system service
Revert^2 "Refactor setCurrentProxyScriptUrl to a void method"
2021-03-15 11:49:45 +00:00
lucaslin
c296fccca1
Add comments to describe the value of converting hex to decimal
...
Bug: 172183305
Test: N/A
Change-Id: Id274295d6c8c97d3014214f875168ff968f79bb6
2021-03-15 09:55:39 +00:00
Chalard Jean
d637272b9c
[NS01] Add NetworkScore
...
As attested by numerous TODOs in the code, a new way of
representing network quality and policy is needed instead
of an int.
An int representing the quality of the network requires
all parties using it to know how all other parties are
using it, and implementation details about the decision
algorithm. For all intents and purposes, the selection
is left to individual network factories who try to
achieve a desired result while piecing together all
possible states of the system.
As the number of such cases and desires increases, this
becomes both intractable and unmaintainable. Indeed, at
this time in the codebase nobody can really predict exactly
how a given change in score will affect selection across
the board, and it is essentially impossible to figure out
the behavior of network selection by inspecting the code
because the moving parts are scattered throughout the
entire codebase.
Having an object encapsulating policy and quality values
will let us centralize the selection and make it again
possible to maintain without knowledge of all behaviors
of all network factories. It will also provide better
guarantees of respecting policy, and allow bugfixes that
were not possible before because they'd touch too many
parts of the code.
Test: FrameworksNetTests FrameworksWifiTests NetworkStackTests
Change-Id: I3185a6412b9b659798faf0c6882699e9c63cc115
2021-03-15 09:49:47 +00:00
Frank Li
06574ee87a
[automerger skipped] Merge "[CS15]Do not use hidden API of PlatformProperties" am: 08ad593dbb am: b2a10bfdbd am: 2e196d3e6a -s ours
...
am skip reason: Change-Id I3a3deca5d2e0f690db8c0061de2db2217376d268 with SHA-1 764e506248 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623261
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If2de4002e694a8063b60b0f6b043bb8830e7a373
2021-03-15 09:41:10 +00:00
Frank Li
b2a10bfdbd
Merge "[CS15]Do not use hidden API of PlatformProperties" am: 08ad593dbb
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623261
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I623fd33e756f9ada6b73f716a30778fd6236f6ae
2021-03-15 08:42:02 +00:00
Remi NGUYEN VAN
6f8207999e
Merge "Revert "Remove connectivity dependency on Preconditions"" am: 310ef3e954 am: 871f91a517 am: b5437344c6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635220
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I04b48a4afef8d62d1368f5c7f7d907cb5e12c82e
2021-03-15 08:26:55 +00:00
Paul Hu
fb32206f12
Merge "Replace InetAddress#parseNumericAddress" am: 2622bfd00a am: 70f311507c am: 8df091c115
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614980
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia6f19204d54688ea6af69d503c6dae441ff7afce
2021-03-15 08:26:28 +00:00
Remi NGUYEN VAN
90efff4cf0
Merge "Remove connectivity dependency on Preconditions" am: 00e1d9ee70 am: 18925df41b am: 4879735886
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628399
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia618516b1cd0096b9550dea38703bde3692915cf
2021-03-15 08:25:36 +00:00