Paul Hu
56824ea17f
Merge "Add ConnectivitySettingsManager" am: 236835e920 am: f1fbb30c09 am: dc9bfe3386
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1641759
Change-Id: Ib5ec1f8cc443d1b92215e6ab200fa383d719d053
2021-03-17 22:21:22 +00:00
Remi NGUYEN VAN
c13ff4aff6
Merge "Remove Protocol.BASE_* usage in Connectivity" am: 5a819fb84d am: 41fe4bfcd4 am: b9a3b1b03b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1629266
Change-Id: I0bb7aec183efdeed894447a3b5abc446b9ca46c8
2021-03-17 22:20:59 +00:00
Remi NGUYEN VAN
bcea4c8e06
[automerger skipped] Merge "Remove extra comment" am: 92d50295e2 -s ours am: 0da809051c -s ours am: aec47bb4bc -s ours
...
am skip reason: skip tag Change-Id I7432fe4c87cd3cab04dcb6185c9a4f3f84376549 with SHA-1 ad43ca6d40 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1641959
Change-Id: I0c0daa91ef272a19c548cf55eb2f764c95f8f844
2021-03-17 22:20:12 +00:00
Lucas Lin
3fca5b232f
Merge "Modify the comment of getPrivateDnsMode" am: 625db39870 am: bdc4e22fe4 am: afcec9cbfe
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640143
Change-Id: I60147e1c828e5d82556e58b67b8f138f63228e8f
2021-03-17 22:19:20 +00:00
Remi NGUYEN VAN
cae9ed6a14
Merge "Remove usage of networkAttributes" am: adf6d20f8f am: e74de6db5a am: 0aff3ed968
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623260
Change-Id: I84aa41ee98535b3b258e52cb67b8f7964d63851b
2021-03-17 22:18:55 +00:00
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
Paul Hu
f1fbb30c09
Merge "Add ConnectivitySettingsManager" am: 236835e920
...
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
41fe4bfcd4
Merge "Remove Protocol.BASE_* usage in Connectivity" am: 5a819fb84d
...
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
236835e920
Merge "Add ConnectivitySettingsManager"
2021-03-17 14:57:32 +00:00
Remi NGUYEN VAN
5a819fb84d
Merge "Remove Protocol.BASE_* usage in Connectivity"
2021-03-17 14:53:26 +00:00
Remi NGUYEN VAN
0da809051c
[automerger skipped] Merge "Remove extra comment" am: 92d50295e2 -s ours
...
am skip reason: skip tag Change-Id I7432fe4c87cd3cab04dcb6185c9a4f3f84376549 with SHA-1 6916d5194b 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
92d50295e2
Merge "Remove extra comment"
2021-03-17 12:16:09 +00:00
Remi NGUYEN VAN
1b9f03a190
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
bdc4e22fe4
Merge "Modify the comment of getPrivateDnsMode" am: 625db39870
...
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
e74de6db5a
Merge "Remove usage of networkAttributes" am: adf6d20f8f
...
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
625db39870
Merge "Modify the comment of getPrivateDnsMode"
2021-03-17 11:25:18 +00:00
Remi NGUYEN VAN
adf6d20f8f
Merge "Remove usage of networkAttributes"
2021-03-17 11:24:28 +00:00
Remi NGUYEN VAN
5b9dd87333
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
845456ebdc
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
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
lucaslin
debfe6062a
Modify the comment of getPrivateDnsMode
...
Bug: 172183305
Test: m
Change-Id: I2f1b44cf2a362b42f052ea5d34a5cec03d46e661
2021-03-17 14:53:35 +08: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