Chiachang Wang
9bd228e4da
Merge changes from topic "replaceUidRange" am: 7b582e9749 am: 38794c5290 am: 28f5f912c5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626206
Change-Id: Ibc5e47f175a0e5433492f81068da9f42496e660b
2021-03-18 18:26:42 +00:00
Chiachang Wang
332f379a59
Merge "Expose APIs for Settings" am: 53178361ae am: 94e9fb339f am: 259c30a6de
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644202
Change-Id: I13a56aa7dcc19efef3dc268fabfa52069360eb18
2021-03-18 18:26:16 +00:00
Lorenzo Colitti
cca30a72ac
Merge "Add a VpnManager.TYPE_VPN_OEM." am: 96d66bb7b8 am: 6ace66ed21 am: 7853e40205
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644265
Change-Id: I512785d414fcfd4819cdf26ff3c3403c049db475
2021-03-18 18:25:54 +00:00
Chalard Jean
dc82a6413f
Merge "Address remaining comments on aosp/1607893" am: 08b0411d4f am: ec138734a7 am: 4c83d1509c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640140
Change-Id: I4d6db2b92d56c3a75ec7a2964df236e9cbdc8f03
2021-03-18 18:25:31 +00:00
Chalard Jean
4ec606c49d
Merge "Move constants to MODULE_LIB" am: 229cf59510 am: 39356af73f am: 80e68e5d1d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640141
Change-Id: I514f5a3d1a4b1498f58170ac652ede394ddf6aeb
2021-03-18 18:24:57 +00:00
Paul Hu
9d73b70404
resolve merge conflicts of 82227141f6 to sc-dev
...
Bug: 182538166
Test: atest FrameworksNetTests
Change-Id: Idd5d75e0e9a7ad4f840b88da55d28fbaa2275dd0
2021-03-18 14:50:05 +00:00
Chiachang Wang
28f5f912c5
Merge changes from topic "replaceUidRange" am: 7b582e9749 am: 38794c5290
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626206
Change-Id: Ie767ae0818210b2f4946450bc6784b89514ff3ad
2021-03-18 14:28:58 +00:00
Chiachang Wang
259c30a6de
Merge "Expose APIs for Settings" am: 53178361ae am: 94e9fb339f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644202
Change-Id: I4a65fa2e637a01f13ac14d8413a7be47a37c7937
2021-03-18 14:28:48 +00:00
Lorenzo Colitti
7853e40205
Merge "Add a VpnManager.TYPE_VPN_OEM." am: 96d66bb7b8 am: 6ace66ed21
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644265
Change-Id: Ic6865adf525d216d38c999a74bb4ffa35641e8a3
2021-03-18 14:28:32 +00:00
Remi NGUYEN VAN
69f81f2ff7
Merge changes I4ad0ca60,I8a03162b into sc-dev
...
* changes:
Expose isUidNetworkingBlocked and isUidRestrictedOnMeteredNetworks
Add multipath preference, background status API
2021-03-18 14:07:12 +00:00
Chiachang Wang
38794c5290
Merge changes from topic "replaceUidRange" am: 7b582e9749
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626206
Change-Id: I3d62d9c03ab6a418e23dd6c5e6f8317b7b375f9c
2021-03-18 14:01:33 +00:00
Chiachang Wang
94e9fb339f
Merge "Expose APIs for Settings" am: 53178361ae
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644202
Change-Id: Ia47e8efc3cc3f40b396c0aa0bd49afea2385e9c3
2021-03-18 13:53:36 +00:00
Lorenzo Colitti
6ace66ed21
Merge "Add a VpnManager.TYPE_VPN_OEM." am: 96d66bb7b8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1644265
Change-Id: Ie010e23484d9ec7ad31631d72292cc52c96f2c10
2021-03-18 13:50:18 +00:00
Chiachang Wang
7b582e9749
Merge changes from topic "replaceUidRange"
...
* changes:
Expose uids related APIs in NetworkRequest and NetworkCapabilities
Replace the usage of UidRange
2021-03-18 13:36:39 +00:00
Chalard Jean
4c83d1509c
Merge "Address remaining comments on aosp/1607893" am: 08b0411d4f am: ec138734a7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640140
Change-Id: Ib54802430fc785ac4cf6094c42c26bb654b361df
2021-03-18 13:31:33 +00:00
Chalard Jean
80e68e5d1d
Merge "Move constants to MODULE_LIB" am: 229cf59510 am: 39356af73f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640141
Change-Id: Ifc5436f5729ffcc40d069bfc649091d2b8821a0e
2021-03-18 13:31:10 +00:00
Paul Hu
82227141f6
Merge "Add more connectivity module settings" am: 9abe34a466 am: 88d4fc79df
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1641784
Change-Id: I269802c5a036181e9eaf90862dbf50b66610f78d
2021-03-18 13:30:33 +00:00
Chiachang Wang
53178361ae
Merge "Expose APIs for Settings"
2021-03-18 13:27:47 +00:00
Lorenzo Colitti
96d66bb7b8
Merge "Add a VpnManager.TYPE_VPN_OEM."
2021-03-18 13:12:08 +00:00
Chalard Jean
ec138734a7
Merge "Address remaining comments on aosp/1607893" am: 08b0411d4f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640140
Change-Id: I49b1ea7e3461ef0cad563d5d7933b5535f94d08c
2021-03-18 12:59:06 +00:00
Chalard Jean
39356af73f
Merge "Move constants to MODULE_LIB" am: 229cf59510
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640141
Change-Id: Ib22b9f3223af2cfe51438e2e19584ec089a4e9d2
2021-03-18 12:55:57 +00:00
Paul Hu
88d4fc79df
Merge "Add more connectivity module settings" am: 9abe34a466
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1641784
Change-Id: If6fab011720145f2ba18df478e6660be442bcad5
2021-03-18 12:53:52 +00:00
Chalard Jean
08b0411d4f
Merge "Address remaining comments on aosp/1607893"
2021-03-18 12:30:14 +00:00
Chalard Jean
4de6088dc9
Address remaining comments on aosp/1607893
...
Test: ConnectivityServiceTest
Change-Id: Icf70b20624604bfade37804311a77ef6be564c09
2021-03-18 12:30:00 +00:00
Chalard Jean
229cf59510
Merge "Move constants to MODULE_LIB"
2021-03-18 12:29:38 +00:00
Paul Hu
9abe34a466
Merge "Add more connectivity module settings"
2021-03-18 12:22:55 +00:00
Remi NGUYEN VAN
523df86f2d
Merge changes I77a3efca,I2c4a37ff into sc-dev
...
* changes:
Migrate framework-connectivity internal resources
Add connectivity protos to framework-connectivity
2021-03-18 11:16:25 +00:00
Remi NGUYEN VAN
35980c9453
[automerger skipped] Remove extra comment am: b78337d701 am: 1405039ed2 -s ours
...
am skip reason: skip tag Change-Id I0c0daa91ef272a19c548cf55eb2f764c95f8f844 with SHA-1 e589e021dd is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13906655
Change-Id: Ia8523fc8557bea3d9635d23472e4301e9b43fde5
2021-03-18 10:42:10 +00:00
Remi NGUYEN VAN
1405039ed2
Remove extra comment am: b78337d701
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13906655
Change-Id: Ia86521977e1064f58651bbdb068211a7929c2cfd
2021-03-18 10:36:45 +00:00
Remi NGUYEN VAN
4d49a1922a
Migrate framework-connectivity internal resources
...
Use ServiceConnectivityResources instead.
Start by creating resources in the ServiceConnectivityResources package
to match the internal configuration, and common overlays.
Bug: 182125649
Test: device boots, has connectivity
Change-Id: I77a3efca2cd644f9828db1ed5d3cae8070fb8363
2021-03-18 09:02:13 +00:00
Remi NGUYEN VAN
d2f03002c9
Add connectivity protos to framework-connectivity
...
The protos are built separately by framework-connectivity from framework
protos, keeping only android.net protos for the connectivity jar.
Bug: 171860710
Test: m framework-connectivity.impl
Change-Id: I2c4a37ff2ee9e8efde49885feeafa27dcff7ca2c
2021-03-18 08:07:20 +00:00
Remi NGUYEN VAN
b78337d701
Remove extra comment
...
This fixes a merge conflict with downstream branches due to an
incomplete cherry-pick.
Bug: 171540887
Test: m
Merged-In: I0c0daa91ef272a19c548cf55eb2f764c95f8f844
Change-Id: I0ec602f573698578e4d72d38772c39a1b88b87d2
2021-03-18 07:11:48 +00:00
Remi NGUYEN VAN
92f20605d8
Add multipath preference, background status API
...
Add APIs for getMultipathPreference and getRestrictBackgroundStatus.
Both are used by Connectivity to back the external
ConnectivityManager.getRestrictBackgroundStatus, and
ConnectivityManager.getMultipathPreference APIs.
Test: atest CtsNetTestCases
atest ConnectivityServiceTests
atest NetworkPolicyManagerServiceTest
Bug: 176289731
Change-Id: I8a03162b2f6691086bb64e75ffd354cdfca7f86a
2021-03-18 06:08:00 +00:00
Lorenzo Colitti
3541fcbcbc
Add a VpnManager.TYPE_VPN_OEM.
...
This needed for OEMs that have VPN types not supported by AOSP.
Bug: 171872481
Test: new test coverage in VpnTransportInfoTest
Change-Id: Ic7529bef7f12d2c74a3be5b1a4a2d54fb0d0bfac
2021-03-18 05:54:53 +00:00
Sudheer Shanka
cb5fd4a670
Add an API to listen for changes in network blocked status of an uid.
...
Given that ConnectivityService is moving to a mainline module, we need
a @SystemApi for it to listen for changes in blocked status of an uid.
So, we decided to create a new API for this which can provide
ConnectivityService with more info about why an uid is blocked (which
will be useful for adding a new similar onBlockedStatusChanged callback
in CM.NetworkCallback) and also captures data saver restriction without
having out to track it separately.
Currently, NPMS does some redundant computations because we are
calculating both uid rules and blocked reasons separately. In a
follow-up change, we will compute uid rules using blocked reasons
and later possibly remove that onUidRulesChanged callback.
Bug: 176289731
Test: atest ./tests/cts/hostside/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
Test: atest ./tests/net/java/com/android/server/ConnectivityServiceTest.java
Test: atest ./services/tests/servicestests/src/com/android/server/net/NetworkPolicyManagerServiceTest.java
Change-Id: Ib9949b8619c6b148f73630b314c4113d76c31ec1
2021-03-18 05:48:44 +00:00
Remi NGUYEN VAN
9416eece40
Merge "Add framework-connectivity.impl" am: 0fcb8d6db4 am: 74a87c1b2a am: 6e77056745
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635039
Change-Id: Ief30f77f949669d9b52ae3a6fe84f8db91179841
2021-03-18 04:36:38 +00:00
Remi NGUYEN VAN
6e77056745
Merge "Add framework-connectivity.impl" am: 0fcb8d6db4 am: 74a87c1b2a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635039
Change-Id: I3528f9db9537634a5d6dde8a09034bdbc5b1f374
2021-03-18 04:02:22 +00:00
paulhu
79260c21a8
Add more connectivity module settings
...
Add more connectivity module settings and update all references
to ConnectivitySettingsManager.
Bug: 182538166
Test: atest FrameworksNetTests
Change-Id: Ie96fbd0996ed3acb37099b6270bf3d4c2e558e9a
2021-03-18 11:58:29 +08:00
Remi NGUYEN VAN
74a87c1b2a
Merge "Add framework-connectivity.impl" am: 0fcb8d6db4
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635039
Change-Id: I9956c78228c2d04e20edf6fee1061861e26978b9
2021-03-18 03:33:42 +00:00
Chiachang Wang
0cefc1c20a
Expose APIs for Settings
...
ConnectivityManager will be a part of incoming connectivity
mainline. Settings will no longer to access the hidden methods.
For those methods that accept the interaction from users, they
should be exposed as formal interface to allow the
functionality. Expose them to API surface.
Bug: 172183305
Test: make update-api
Change-Id: Id4533b94291766bb060af0091b5ccb81a00630fd
2021-03-18 11:18:56 +08:00
Paul Hu
1ef84e6de6
Merge "Add ConnectivitySettingsManager" am: 3e17e82ab1 am: af229a6c7b am: b43a0ed287
...
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
a481bd785f
Merge "Remove Protocol.BASE_* usage in Connectivity" am: 7ffb87e4ce am: e4a8d2ff33 am: ec5b8f3b24
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1629266
Change-Id: I0bb7aec183efdeed894447a3b5abc446b9ca46c8
2021-03-17 22:20:59 +00:00
Paul Hu
1c2606742d
Merge "Remove Settings.Global.TCP_DEFAULT_INIT_RWND on CS" am: 3d136c56ca am: f3ba1620ea am: afa9f0f918
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635043
Change-Id: I2a83ab615ae2b40304a65f7ea8e40c6a93fc122a
2021-03-17 22:20:36 +00:00
Remi NGUYEN VAN
e589e021dd
[automerger skipped] Merge "Remove extra comment" am: be83a4afc5 -s ours am: 3414a57e61 -s ours am: 516d3b7c75 -s ours
...
am skip reason: skip tag Change-Id I7432fe4c87cd3cab04dcb6185c9a4f3f84376549 with SHA-1 076dcdc403 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
d04269e96d
Merge "Modify the comment of getPrivateDnsMode" am: de9a3af4de am: e0e9636048 am: 388c821087
...
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
4417837f49
Merge "Remove usage of networkAttributes" am: 5ccc21eb9b am: 5498465192 am: 9df643d6b6
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623260
Change-Id: I84aa41ee98535b3b258e52cb67b8f7964d63851b
2021-03-17 22:18:55 +00:00
TreeHugger Robot
bd59ba1955
[automerger skipped] Merge changes I6ec246a6,If7eb8857,Id3d12b23,Ia52f9caf,I21028457, ... into rvc-dev am: 65eb4a4332 -s ours am: 01a59e4727 -s ours am: f0c45658c8 -s ours
...
am skip reason: skip tag Change-Id I6ec246a6a4e61f634956a165797fbb80296efd6a with SHA-1 cbaf93951c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425320
Change-Id: I2f4ae9a474007eb1b2d63c20463f28d21e54aa14
2021-03-17 22:18:21 +00:00
Lucas Lin
bb0a04be85
[automerger skipped] Merge "Change the parameter type from ContentResolver to Context" am: 8d638d9434 am: 8df3a6b774 am: c6bd2f85e6 -s ours
...
am skip reason: skip tag Change-Id I5702c7d74b862a76558b94f1abe2c6df9eb7f097 with SHA-1 acd3ded007 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
63d9588dca
Merge changes I335e82e2,I84ba363d,I8f18083b,I854a952d,I00e23441 am: bf97a3ab5e am: ba22df4f9d am: 2d82b40262
...
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
8d2f1d6f06
Merge "Remove MessageUtils usage in VpnTransportInfo" am: 0b33d35188 am: e1aa50a18a am: 8248cbc3da
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635041
Change-Id: Ibf1592220cedb387d8edba27a7bbe49a36f42dc0
2021-03-17 22:10:16 +00:00