Chalard Jean
7851544cb5
[NS07] Add the rest of the scoring policy
...
Bug: 167544279
Test: FrameworksNetTests
Change-Id: I5ea44a94ac6f16486274e9091f15a84734db2341
2021-03-30 23:50:41 +09:00
Lorenzo Colitti
61a9bf9f02
Merge changes If539cf5d,I9765f1c9,I6d3007a1 am: 2206e976c1 am: 8c9d2c1823 am: 958a701738
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652262
Change-Id: I94e5cf19a7b7dac8400cb7acf80b39a864099956
2021-03-30 02:24:00 +00:00
Lorenzo Colitti
958a701738
Merge changes If539cf5d,I9765f1c9,I6d3007a1 am: 2206e976c1 am: 8c9d2c1823
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652262
Change-Id: I028d1f51c9685bcc7bcaabd0339b930aa46940c6
2021-03-30 01:58:24 +00:00
Lorenzo Colitti
8c9d2c1823
Merge changes If539cf5d,I9765f1c9,I6d3007a1 am: 2206e976c1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652262
Change-Id: Iab7a5cdb9d50314b0bdb982b88a9335b64ddb276
2021-03-30 01:14:09 +00:00
Lorenzo Colitti
624a47fc57
Merge "Add session ID to VpnTransportInfo" into sc-dev
2021-03-30 00:39:38 +00:00
Lorenzo Colitti
2206e976c1
Merge changes If539cf5d,I9765f1c9,I6d3007a1
...
* changes:
Add test coverage for NetworkAgent callbacks.
Add a setTeardownDelayMs API to NetworkAgent.
Address comments on onBlockedStatusChanged(Network, int) CL.
2021-03-30 00:38:47 +00:00
Sudheer Shanka
9d483f1a54
Merge "Remove NetworkPolicyManager.isUidBlocked() API." am: 9cff99d059 am: d5da6e7182 am: b8d6d47bd5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652550
Change-Id: Ic5c9fb2603a010976bc93e5059e5548ee782005e
2021-03-29 17:45:42 +00:00
Sudheer Shanka
b8d6d47bd5
Merge "Remove NetworkPolicyManager.isUidBlocked() API." am: 9cff99d059 am: d5da6e7182
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652550
Change-Id: I354cd41d18cfab87b1302d2dbd0ba5dcd10edca6
2021-03-29 16:57:17 +00:00
Sudheer Shanka
d5da6e7182
Merge "Remove NetworkPolicyManager.isUidBlocked() API." am: 9cff99d059
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652550
Change-Id: Ia95b11bcf91f18338b26146f6bb9488861555303
2021-03-29 16:19:05 +00:00
Frank Li
99a58b3607
[automerger skipped] Merge changes from topic "NetworkAgent02" am: 8539ed6fd2 am: b1d27c29ff am: 8b71e08ac6 -s ours
...
am skip reason: skip tag Change-Id Ie0fd5ba816c390bfb7bc6512d896a88482c217ec with SHA-1 a3f6cae74b is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1654917
Change-Id: Ie95c3a94fa2a7e730ad43fa545dc82cf20c0e1bd
2021-03-29 12:58:19 +00:00
lifr
3c7d53de31
[automerger skipped] [TL02]Remove hidden API usage of NetworkAgent am: f1594291c4 am: 3ab40b5390 am: 03b9a590ea -s ours
...
am skip reason: skip tag Change-Id I4e4040ae7f94bdf479c7df9ec2ffabafbe06331c with SHA-1 cbe8c09525 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1642722
Change-Id: I627119002e2d4230939d2017728959934f14a528
2021-03-29 12:58:09 +00:00
Sudheer Shanka
90358f5154
Remove NetworkPolicyManager.isUidBlocked() API.
...
It isn't used by ConnectivityService any more and even if
it needs such utility method in the future, we could create
one which is part of connectivity module and doesn't need
to be exposed as part of NetworkPolicyManager API surface.
Bug: 183696103
Test: atest ./tests/net/java/com/android/server/ConnectivityServiceTest.java
Change-Id: Ie3c681f88e4b2b9bb92d2224c5ea96b074f155d5
2021-03-29 12:39:12 +00:00
Lorenzo Colitti
1bc9ad0375
Add test coverage for NetworkAgent callbacks.
...
Tests the onNetworkCreated, onNetworkUnwanted and
onNetworkDisconnected callbacks, and the teardown delay timer.
Bug: 181941583
Test: atest --rerun-until-failure 500 ConnectivityServiceTest#testNetworkAgentCallbacks
Change-Id: If539cf5d01ba23193afab2433ed0ac4e7f0550ec
2021-03-29 21:33:11 +09:00
Lorenzo Colitti
6d88078151
Add a setTeardownDelayMs API to NetworkAgent.
...
This allows transports to request that when the network is
disconnected, the system should delay destroying the native
network until the specified time has passed after the network
disconnected.
Bug: 181941583
Test: next CL in the stack
Change-Id: I9765f1c9d1e55c23c6d583d6709dbe06505975b1
2021-03-29 21:33:08 +09:00
Frank Li
8b71e08ac6
Merge changes from topic "NetworkAgent02" am: 8539ed6fd2 am: b1d27c29ff
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1654917
Change-Id: If099f376bfd5d456e938612005c4008b0beae91a
2021-03-29 12:14:01 +00:00
lifr
03b9a590ea
[TL02]Remove hidden API usage of NetworkAgent am: f1594291c4 am: 3ab40b5390
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1642722
Change-Id: Id2679c6437a31718fb7612b07712bf8cef7fa293
2021-03-29 12:13:51 +00:00
Frank Li
b1d27c29ff
Merge changes from topic "NetworkAgent02" am: 8539ed6fd2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1654917
Change-Id: If59df525be2483064976d3919cf7033fb94e41e6
2021-03-29 11:43:14 +00:00
lifr
3ab40b5390
[TL02]Remove hidden API usage of NetworkAgent am: f1594291c4
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1642722
Change-Id: I12342dc4c4ee8748396b7ced2f344611704caa2d
2021-03-29 11:39:55 +00:00
Lorenzo Colitti
a37eaff1ea
Address comments on onBlockedStatusChanged(Network, int) CL.
...
Test: m
Bug: 165835257
Change-Id: I6d3007a1eac54ee6650b350aee56ed398a2c950d
2021-03-29 20:12:09 +09:00
Frank Li
8539ed6fd2
Merge changes from topic "NetworkAgent02"
...
* changes:
Fix cannot success verify count of the networkAgent Config items on R device
[TL02]Remove hidden API usage of NetworkAgent
2021-03-29 11:08:24 +00:00
Junyu Lai
92a0b5130f
Merge "Support Dual ViLTE stats" am: 371bd281f5 am: 4890738bde am: f4cd11179a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540920
Change-Id: I5739265c2747055b0252da7d1fb9e47d61ca111c
2021-03-29 09:05:02 +00:00
Junyu Lai
f4cd11179a
Merge "Support Dual ViLTE stats" am: 371bd281f5 am: 4890738bde
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540920
Change-Id: Iaa7d8d3dcb106cd19777fe1ff64db5ab4ea75991
2021-03-29 08:26:07 +00:00
Junyu Lai
4890738bde
Merge "Support Dual ViLTE stats" am: 371bd281f5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540920
Change-Id: Ie65e2a2530b3e10b1cb7b571bbe4e7255caf1b08
2021-03-29 07:37:34 +00:00
lifr
f459c60984
Fix cannot success verify count of the networkAgent Config items on R
...
device
Test: atest CtsNetTestCasesLatestSdk:android.net.NetworkAgentConfigTest
Fix: 183474500
Change-Id: Ie0fd5ba816c390bfb7bc6512d896a88482c217ec
Merged-In: Ie0fd5ba816c390bfb7bc6512d896a88482c217ec
2021-03-29 15:36:32 +08:00
lifr
f1594291c4
[TL02]Remove hidden API usage of NetworkAgent
...
The connection service will become the mainline module.
Remove the hidden API usage of NetworkAgent.
Bug: 170598012
CTS-Coverage-Bug: 170598012
Test: atest FrameworksNetTests FrameworksTelephonyTests
atest FrameworksWifiTests
Change-Id: I4e4040ae7f94bdf479c7df9ec2ffabafbe06331c
Merged-In: I4e4040ae7f94bdf479c7df9ec2ffabafbe06331c
2021-03-29 15:33:44 +08:00
Remi NGUYEN VAN
26370d89d3
[automerger skipped] Merge "Re-implement NetworkUtils#queryUserAccess." am: a99e50dbf7 am: 7c9169bd61 am: 14c40c0c95 -s ours
...
am skip reason: skip tag Change-Id If855de1ea3e1fd2ed30f2795d9b4acfcf969a2dc with SHA-1 d81932b836 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1650330
Change-Id: I29ce6476762b1b4de205481ee8a5cab251220880
2021-03-29 06:59:52 +00:00
Junyu Lai
371bd281f5
Merge "Support Dual ViLTE stats"
2021-03-29 06:59:19 +00:00
Remi NGUYEN VAN
14c40c0c95
Merge "Re-implement NetworkUtils#queryUserAccess." am: a99e50dbf7 am: 7c9169bd61
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1650330
Change-Id: I8c016c0056fd29e60d89d5a90e75a7305ad73231
2021-03-29 06:14:57 +00:00
Remi NGUYEN VAN
7c9169bd61
Merge "Re-implement NetworkUtils#queryUserAccess." am: a99e50dbf7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1650330
Change-Id: I1dd7913bacf5b92e35ec0a5b14da4d9b40513f21
2021-03-29 05:32:39 +00:00
Remi NGUYEN VAN
a99e50dbf7
Merge "Re-implement NetworkUtils#queryUserAccess."
2021-03-29 04:57:40 +00:00
Lorenzo Colitti
092af05525
Re-implement NetworkUtils#queryUserAccess.
...
Currently, queryUserAccess talks to netd via FwmarkServer.
Doing this from the module would require exposing queryUserAccess
as an NDK API or reimplementing FwmarkClient.
Because queryUserAccess really only uses information that comes
from ConnectivityService/PermissionMonitor anyway, just use that
information without calling to net.
Test: atest HostsideVpnTests
Bug: 171540887
Merged-In: If855de1ea3e1fd2ed30f2795d9b4acfcf969a2dc
Change-Id: If855de1ea3e1fd2ed30f2795d9b4acfcf969a2dc
2021-03-29 12:11:19 +09:00
lifr
5acb6b6d4e
Add session ID to VpnTransportInfo
...
- This will be visible only to apps with the NETWORK_SETTINGS
permissions (signature), and will be redacted for all other callers.
- This string is expected to be the same as set by
VpnService#setSession, and in general, VpnConfig.session. But it
will be a general API that Vpn.java can call when setting the
VpnTransportInfo.
- This string cannot be updated once the VPN NetworkAgent is connected.
Bug: 171872481
Test: atest ConnectivityServiceTest
atest VpnTransportInfoTest
atest android.net.cts.NetworkAgentTest
Change-Id: I8d09e25b83f7ee8be21ec9c9bd3c72a251f1370d
2021-03-29 10:12:17 +08:00
TreeHugger Robot
b818d4bb73
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-03-26 18:02:54 +00:00
Treehugger Robot
ec623b7fb5
[automerger skipped] Merge "Add network disconnected callback" am: 6d1437a596 am: 11d95a5c72 am: 9e4cb91813 -s ours
...
am skip reason: skip tag Change-Id I602ff2c688909473b03b72c9407d4286608cff4c with SHA-1 4ab0a63b36 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652259
Change-Id: I7a5a9589eaa8ef0022d5f9ee5f857bbe70fa38ad
2021-03-26 07:54:23 +00:00
Treehugger Robot
9e4cb91813
Merge "Add network disconnected callback" am: 6d1437a596 am: 11d95a5c72
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652259
Change-Id: Iec2661c2f77a17784f7be963d1a4d8ec8ef483ec
2021-03-26 07:05:30 +00:00
Treehugger Robot
11d95a5c72
Merge "Add network disconnected callback" am: 6d1437a596
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652259
Change-Id: I75bd112821c42c16d7ed91ecbb4f21104c95204b
2021-03-26 06:28:19 +00:00
Treehugger Robot
6d1437a596
Merge "Add network disconnected callback"
2021-03-26 05:47:33 +00:00
Lorenzo Colitti
080d3830c2
Merge changes from topic "blocked-reasons-callback-tests" am: 2108a92452 am: 7de5bd543e am: 994e2cedb1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652214
Change-Id: I4d69b1ce096d83c311620950650460024ae348c0
2021-03-26 05:27:47 +00:00
paulhu
152cc47c50
[automerger skipped] Add MOBILE_DATA_PREFERRED_APPS setting am: 521169738c am: 26611dc3d3 am: 01c795ec5c -s ours
...
am skip reason: skip tag Change-Id Ic5e0515b2b948de3d333c8d8e073d0b15514562a with SHA-1 4bbfc2b338 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1654015
Change-Id: I2c0061b6ee92303bb68f2752d038e578abcb1b85
2021-03-26 05:27:25 +00:00
paulhu
9c02a86837
[automerger skipped] Add PRIVATE_DNS_MODE setting setter am: 87ac58016f am: 43944db404 am: bce84c9a66 -s ours
...
am skip reason: skip tag Change-Id If234426f041606c4881de1eca31b6f5bdb3c6bfe with SHA-1 2832146318 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1654014
Change-Id: I75eaedbfd00428cad87e5398c1f3bd54f0dbcd43
2021-03-26 05:27:07 +00:00
paulhu
e77a22a8c3
[automerger skipped] Expose ConnectivitySettingsManager as module-lib API am: e6badefc33 am: df6a143255 am: 578821f72d -s ours
...
am skip reason: skip tag Change-Id I82225a43f95e3e1d3e52c4e7a0fc541c0087292e with SHA-1 a0714d8a17 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1654013
Change-Id: Ibbe2daf0a26138fce2db0a00eebd32f1dd7c0df5
2021-03-26 05:26:39 +00:00
Chalard Jean
be07793b86
Merge changes from topic "ns05" into sc-dev
...
* changes:
[NS06] Implement the don't-reap mechanism
[NS05] Feed network offer callbacks
2021-03-26 05:07:39 +00:00
Lorenzo Colitti
994e2cedb1
Merge changes from topic "blocked-reasons-callback-tests" am: 2108a92452 am: 7de5bd543e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652214
Change-Id: Ie51249f5fa47b0a5afe287083139082488f9b503
2021-03-26 04:36:19 +00:00
paulhu
01c795ec5c
Add MOBILE_DATA_PREFERRED_APPS setting am: 521169738c am: 26611dc3d3
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1654015
Change-Id: I25b39c8f35dd80d13775c4a9c5074b2cd8c9f297
2021-03-26 04:36:10 +00:00
paulhu
bce84c9a66
Add PRIVATE_DNS_MODE setting setter am: 87ac58016f am: 43944db404
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1654014
Change-Id: Iddc394112f17b3e4264a42c6326148833efe9297
2021-03-26 04:36:06 +00:00
paulhu
578821f72d
Expose ConnectivitySettingsManager as module-lib API am: e6badefc33 am: df6a143255
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1654013
Change-Id: I0d623f62c2e5d4c975f74b1efed24bdf5cc7c669
2021-03-26 04:36:02 +00:00
Bill Yi
8d564a64ef
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Icb6afda3dd121777b2868361d2349917d2008d4d
2021-03-26 04:18:32 +00:00
Lorenzo Colitti
7de5bd543e
Merge changes from topic "blocked-reasons-callback-tests" am: 2108a92452
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1652214
Change-Id: I02f2f4458329e17ab33d792dee98ffe5f6499ad0
2021-03-26 04:04:27 +00:00
paulhu
26611dc3d3
Add MOBILE_DATA_PREFERRED_APPS setting am: 521169738c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1654015
Change-Id: I4d5c5cfaa2a35a6919517c6e5737fffdd0f217f3
2021-03-26 04:02:02 +00:00
paulhu
43944db404
Add PRIVATE_DNS_MODE setting setter am: 87ac58016f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1654014
Change-Id: I97de83147a0c656802601ec116ee9ee7de114884
2021-03-26 03:58:53 +00:00