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
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
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
Remi NGUYEN VAN
cfa1528c88
Merge "Move LocationPermissionChecker to libs/net" am: 6dde6eceab am: eccbb61f58 am: 78bae8b5dd
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1618840
Change-Id: Ia9beda02a8183eda4fe195404980d4d9012afb3f
2021-03-17 22:09:51 +00:00
Junyu Lai
f4cbe4d191
Merge "[VCN14] Expose registerBestMatchingNetworkCallback" am: 29908cf3c4 am: 789f3829a0 am: b77d000812
...
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
2ac4e6eee4
Merge "[VCN13] Implement tracking best matching network" am: f98037abb3 am: 4377c5d40c am: b56ee13b44
...
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
082ec98e2a
Merge "Replace interal okhttp APIs" am: e3ed08a24d am: c7b4df71f6 am: 970d67d760
...
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
85d77edcbd
Merge "Remove NETWORK_STACK_UID check" am: 5f7eb9024e am: f23bda53b2 am: cb2db75d6f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1635323
Change-Id: Icade0541f309622e39c9b02d86fbb6822c378fb1
2021-03-17 16:06:56 +00:00
Lucas Lin
51121bf08f
Merge "Add comments to describe the value of converting hex to decimal" am: 26f778d2bd am: dc6444c414 am: 8885169a2e
...
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
bb98a5bb42
[automerger skipped] Merge "Have a new API to get private DNS mode" am: 11a286c9b5 am: eafa4097bd am: 9ecf4d330b -s ours
...
am skip reason: skip tag Change-Id I02a1e91b4eafb5f5df3eada1c07b99849a050c3c with SHA-1 50205afdd8 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
1cda30b0a2
Merge "[NS01] Add NetworkScore" am: 98de10a7a1 am: 18294fcbb3 am: a73e64726f
...
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
5a66dd85b2
Merge "Add ParseException constructors to API" am: ef7b38b334 am: 2299e83d12 am: 40078d1567
...
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
35a32733e9
[automerger skipped] Merge "Create ServiceConnectivityResources" am: eb46aa1c58 am: 4df498eb9a am: 19e5014a61 -s ours
...
am skip reason: skip tag Change-Id I77ac6f4303c54acc96f16e18ef02add30298ff3d with SHA-1 0c8f517e50 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
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
Remi NGUYEN VAN
1142754c99
Add framework-connectivity.impl
...
The library will be included in the connectivity module APEX when
migrating its sources out of framework-minus-apex.
Bug: 171540887
Test: m
Change-Id: I1595521eaced6e6997c076bb56b06ffdd22a4fa0
2021-03-18 00:29:08 +09: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
b99427e21f
[automerger skipped] Merge changes I6ec246a6,If7eb8857,Id3d12b23,Ia52f9caf,I21028457, ... into rvc-dev am: 65eb4a4332 am: f80adf07e2 -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: I0d9e8484e30a9cc730897841779b454a86a4ca52
2021-03-17 09:41:45 +00:00
Lorenzo Colitti
fb86cc877f
[automerger skipped] Backport test coverage from aosp/1547496. am: ee5ed04cbf am: ee04333c71 -s ours
...
am skip reason: skip tag Change-Id Ibf376a6fa4b34d1c96f8506fa8abbb7595a8c272 with SHA-1 c284b4b8dd is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425319
Change-Id: Id9d9f9db4bbed35bea8599a33a94c4248463364c
2021-03-17 09:41:36 +00:00
Lorenzo Colitti
18ec4b5fa9
[automerger skipped] Backport some helpers in ConnectivityServiceTest. am: 853504c524 am: 646fa39db0 -s ours
...
am skip reason: skip tag Change-Id I827543751dbf5e626a24ec02cd6f50b423f5f761 with SHA-1 bb6b62a41e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425318
Change-Id: Ia26d7b281695355b9d96a4689fa6edd28b9355b0
2021-03-17 09:41:26 +00:00