satayev
5d2639e7e2
Merge "Revert "[VCN01] Add NOT_VCN_MANAGED capability"" am: ca95071a98 am: f9253eefae am: b8cf9e427b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549962
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I051a51e5ee5898784d3a126140536ddeec6a0ba6
2021-01-13 18:53:37 +00:00
satayev
b8cf9e427b
Merge "Revert "[VCN01] Add NOT_VCN_MANAGED capability"" am: ca95071a98 am: f9253eefae
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549962
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic0fd366c8ae249072d32fafc6d70e4dc995ad7ae
2021-01-13 18:52:27 +00:00
satayev
f9253eefae
Merge "Revert "[VCN01] Add NOT_VCN_MANAGED capability"" am: ca95071a98
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1549962
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I03dade86df57e4728eea88ab9b148251a1097c85
2021-01-13 18:32:31 +00:00
satayev
ca95071a98
Merge "Revert "[VCN01] Add NOT_VCN_MANAGED capability""
2021-01-13 17:40:03 +00:00
Lorenzo Colitti
d39070b761
Merge "Stop using VPNs in getActiveNetworkForUidInternal." am: c4706c1dbd am: 8effce3231 am: 3a2ccd59dd
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1529106
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie3a2d91045fccbf7b03bca9f6d2bc67c598d8d62
2021-01-13 15:35:20 +00:00
Lorenzo Colitti
3a2ccd59dd
Merge "Stop using VPNs in getActiveNetworkForUidInternal." am: c4706c1dbd am: 8effce3231
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1529106
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I99171813b9dba39ac95bab1391fd8db905b5f841
2021-01-13 15:14:28 +00:00
satayev
5e2b869dfc
Revert "[VCN01] Add NOT_VCN_MANAGED capability"
...
This reverts commit 869e7020a0 .
Reason for revert: b/177411288 broken test
Bug: 177411288
Bug: 175662146
Change-Id: I02a25b83e62ab9a2ed22a98530d62b08de73f56e
2021-01-13 15:04:23 +00:00
Lorenzo Colitti
8effce3231
Merge "Stop using VPNs in getActiveNetworkForUidInternal." am: c4706c1dbd
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1529106
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0e0de3f3cd9762feecf5dda5a40bb50791f17654
2021-01-13 14:54:40 +00:00
Rick Yiu
56e47c492e
Merge "Revert "NetworkCapabilities: Embed location senstive TransportInfo""
2021-01-13 14:30:52 +00:00
Lorenzo Colitti
c4706c1dbd
Merge "Stop using VPNs in getActiveNetworkForUidInternal."
2021-01-13 13:52:56 +00:00
Junyu Lai
aeb5c17911
Merge "Align coding style of line-wrapping in NetworkCapabilities" am: 74d132736b am: deb6c74bd8 am: c7714d1c32
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1529105
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I15dc61c1c845de22cd973156e00549395800edeb
2021-01-13 12:09:32 +00:00
Junyu Lai
c7714d1c32
Merge "Align coding style of line-wrapping in NetworkCapabilities" am: 74d132736b am: deb6c74bd8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1529105
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I93eb38109e4c72375fb591af0828dac3da1255c7
2021-01-13 11:50:11 +00:00
Junyu Lai
deb6c74bd8
Merge "Align coding style of line-wrapping in NetworkCapabilities" am: 74d132736b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1529105
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5e1146c6e374a0e7b31d8a8615545f4486fcd4ba
2021-01-13 11:32:40 +00:00
Junyu Lai
74d132736b
Merge "Align coding style of line-wrapping in NetworkCapabilities"
2021-01-13 10:40:43 +00:00
Chiachang Wang
5cb5a73fcf
Merge "[IT4.21] Update the label type of idle timer" am: 810f56be46 am: da0694f94a am: b9789b1bd4
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535721
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I9445412f619fa8d4d0e7888a333bbdffdca013bf
2021-01-13 10:33:55 +00:00
Chiachang Wang
b9789b1bd4
Merge "[IT4.21] Update the label type of idle timer" am: 810f56be46 am: da0694f94a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535721
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6d54f242cee6171c8666efed21d83349366b7070
2021-01-13 10:12:15 +00:00
Chiachang Wang
da0694f94a
Merge "[IT4.21] Update the label type of idle timer" am: 810f56be46
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535721
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib5bec3e22e835d99ffa6dec818114f8e4fb88ecd
2021-01-13 09:41:26 +00:00
Chiachang Wang
810f56be46
Merge "[IT4.21] Update the label type of idle timer"
2021-01-13 09:10:43 +00:00
Junyu Lai
5591c1c73e
Merge "[VCN01] Add NOT_VCN_MANAGED capability" am: 82ffaf2ac2 am: 0afa8fa899 am: 101173a281
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1529959
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I2ef798c4f1d66196322796c5e7ca9254300b5f78
2021-01-13 09:00:08 +00:00
Junyu Lai
101173a281
Merge "[VCN01] Add NOT_VCN_MANAGED capability" am: 82ffaf2ac2 am: 0afa8fa899
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1529959
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I782f688fc0cfa8d211b1c9cabaebf22ca19c8791
2021-01-13 08:44:10 +00:00
Rick Yiu
a427afd7e3
Revert "NetworkCapabilities: Embed location senstive TransportInfo"
...
Revert "WifiLocationTest: Add test for Wifi TransportInfo"
Revert "WifiInfo: Embed location sensitive TransportInfo"
Revert submission 13274595
Reason for revert: DroidMonitor: Potential culprit for Bug 177390648 - verifying through Forrest before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.
Reverted Changes:
Ibcf0c6711:WifiInfo: Embed location sensitive TransportInfo
Ic68546e2a:WifiService: Use WifiInfo for masking
Ie522d8c75:NetworkCapabilities: Embed location senstive Trans...
Iaf0fef999:WifiLocationTest: Add test for Wifi TransportInfo
I017de6d4c:ClientModeImpl: Fill info elements for connected b...
I384c9321e:WifiInfo: Add info elements for connected bssid
Change-Id: I4e96850b96dc5ea71d9bb6af2ff17343b8d09d68
2021-01-13 08:36:22 +00:00
Junyu Lai
0afa8fa899
Merge "[VCN01] Add NOT_VCN_MANAGED capability" am: 82ffaf2ac2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1529959
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia4bb9e25c5488491f3802f9987ca2023e87408ee
2021-01-13 08:16:03 +00:00
junyulai
70988816f9
Align coding style of line-wrapping in NetworkCapabilities
...
Test: TH
Change-Id: Ic864524a60954f8dbcce265643c2cb3ac3aefca8
2021-01-13 07:45:18 +00:00
Chiachang Wang
5031026448
[IT4.21] Update the label type of idle timer
...
The first parameter of adding idle timer is an unique identity
to communicate between ConnectivityService and netd. Netd will
notify the activity change using the identity, so it's fine to
replace the legacy type with transport type since we should
deprecate the usage of legacy type.
Bug: 170598012
Test: atest FrameworksNetTests
Change-Id: Ia00606539b86872cca9a92285bd940c8a720a033
2021-01-13 14:10:15 +08:00
Hai Shalom
41473668e1
Merge "Support for Venue URL and friendly name from Network agent" am: 6fce4189cd am: 5485906661 am: 16750033ff
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1515261
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I52b5fdc3445d35a19c0281469b4780bc5fe12199
2021-01-13 03:48:44 +00:00
Hai Shalom
16750033ff
Merge "Support for Venue URL and friendly name from Network agent" am: 6fce4189cd am: 5485906661
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1515261
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia8f462fc38255cdb41edc833f4b6e93f14d3290d
2021-01-13 03:14:12 +00:00
junyulai
869e7020a0
[VCN01] Add NOT_VCN_MANAGED capability
...
Add new capability to indicate whether a network is
managed by Virtual Carrier Network (VCN). This is needed
to identify networks between VCN managed network and
others. And this capability will be:
1. mutable
2. requestable
3. set by default for network agents and requests
4. allowed for test networks
Test: 1. atest FrameworksNetTests CtsNetTestCases
2. adb shell dumpsys connectivity
3. atest ConnectivityServiceTest#testLoseMutableAndRequestableCaps
Bug: 175662146
Change-Id: Ia5eeb3912a687164fa95d7ba5516fd73abca79ba
2021-01-13 11:05:40 +08:00
Roshan Pius
d04061ee77
Merge "NetworkCapabilities: Embed location senstive TransportInfo"
2021-01-13 02:26:34 +00:00
Hai Shalom
5485906661
Merge "Support for Venue URL and friendly name from Network agent" am: 6fce4189cd
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1515261
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I675ccea6bc692cf8519fce1026aa324efe774564
2021-01-13 02:09:39 +00:00
Hai Shalom
6fce4189cd
Merge "Support for Venue URL and friendly name from Network agent"
2021-01-13 01:54:05 +00:00
Lorenzo Colitti
9d76a44551
Merge changes I3eb82680,I9d6147d9 am: 013be9d6c8 am: a619c0c2d7 am: 6158fa695f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547644
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3f0d6bfead295ed6a98a15ef9bb3542b88d5652a
2021-01-13 00:50:46 +00:00
Lorenzo Colitti
6158fa695f
Merge changes I3eb82680,I9d6147d9 am: 013be9d6c8 am: a619c0c2d7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547644
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8a111bb928c5afd2cbbb15db503b60ef501ff2e0
2021-01-13 00:49:30 +00:00
Lorenzo Colitti
a68139ae1b
Stop using VPNs in getActiveNetworkForUidInternal.
...
After this CL, ConnectivityService no longer needs to grab the
VPN lock and access Vpn objects to determine connectivity state.
Also make a synchronized (mVpns) block smaller.
Bug: 173331190
Test: existing tests in ConnectivityServiceTest
Change-Id: I3297b3ab8e75bdf4902c62dd7e492c3634cfc51f
2021-01-13 09:39:01 +09:00
Lorenzo Colitti
a619c0c2d7
Merge changes I3eb82680,I9d6147d9 am: 013be9d6c8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1547644
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8d65a0465729426fb038004cd80a15ca9e438b0e
2021-01-13 00:34:09 +00:00
Lorenzo Colitti
013be9d6c8
Merge changes I3eb82680,I9d6147d9
...
* changes:
NetworkWatchlistServiceTests: update IIpConnectivityMetrics.
Stop using IIpConnectivityMetrics in ConnectivityService.
2021-01-13 00:31:56 +00:00
Tomasz Wasilczyk
ddbc7feb4d
Merge "Keep Vehicle internal network always up" am: 2602edad73 am: fad6801459 am: 0c90d69a61
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535861
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic3fad64a3a049e760f60a63b826c6f0d962309bb
2021-01-12 23:47:18 +00:00
Ken Chen
1ba322e461
Merge "Let ConnectivityService control the socket closure" am: 191e2d3c39 am: 968c4ed867 am: 9d2c783e91
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534909
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I159a4a4115f200e78bc368d9db2997c58d0858b8
2021-01-12 23:46:44 +00:00
Tomasz Wasilczyk
0c90d69a61
Merge "Keep Vehicle internal network always up" am: 2602edad73 am: fad6801459
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535861
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibfb77d0632352c41629395fe4d8b546c593599ce
2021-01-12 23:04:07 +00:00
Ken Chen
9d2c783e91
Merge "Let ConnectivityService control the socket closure" am: 191e2d3c39 am: 968c4ed867
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534909
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I792005c9abd7ccf6a0948330a32b2dcc07d51506
2021-01-12 23:03:49 +00:00
Tomasz Wasilczyk
fad6801459
Merge "Keep Vehicle internal network always up" am: 2602edad73
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535861
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I486b4c9dd987dd94b4e4ca9d1f87fe58d9f9f51e
2021-01-12 22:43:41 +00:00
Tomasz Wasilczyk
2602edad73
Merge "Keep Vehicle internal network always up"
2021-01-12 22:40:50 +00:00
Ken Chen
968c4ed867
Merge "Let ConnectivityService control the socket closure" am: 191e2d3c39
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1534909
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I867128ec2eddf494c8ff15e19c54733778d5eace
2021-01-12 22:39:07 +00:00
Tomasz Wasilczyk
2793ab9e5b
Keep Vehicle internal network always up
...
Bug: 171801262
Test: Boot with and without overlay set and check ifconfig
Change-Id: I1fd332caf3e09924abcfec9c2c137363be7873e4
2021-01-12 10:33:38 -08:00
Ken Chen
b8e4bc9c3f
Let ConnectivityService control the socket closure
...
Netd currently calls maybeCloseSockets before adding/removing users for
network. The task should be moved from netd to CS. In this way, we can
handle WiFi lingering more easily in the future.
Test: atest HostsideVpnTests
Test: atest FrameworksNetTests
Change-Id: Icf8125e8552c89da367a67f48611ed193a1a343d
2021-01-12 23:50:28 +08:00
Lorenzo Colitti
d9932a7da8
Stop using IIpConnectivityMetrics in ConnectivityService.
...
Currently, ConnectivityService calls the IpConnectivityMetrics
service class directly to log default network events. This is
incompatible with ConnectivityService being in a mainline module.
Replace direct access to IIpConnectivityMetrics with public
methods in IpConnectivityLog, which is @SystemApi class.
The new methods are not yet @SystemApi, but they can be made so
if desired. Alternatively, these metrics could be deleted.
Also remove the IpConectivityMetrics service from the
service-connectivity JAR, and go back to starting it from
SystemServer.java, which is what was happening a few hours ago
before aosp/1542626 was merged.
Test: builds, boots
Test: atest FrameworksNetTests
Test: "dumpsys connmetrics" shows events, including default network events
Change-Id: I9d6147d93590363a2f8f83f39f05c03d001b4851
2021-01-12 23:19:49 +09:00
Lorenzo Colitti
183bdef769
Merge "Remove Vpn#isBlockingUid." am: 57f4dfc101 am: aeeac8d0c7 am: 19281cbdb4
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1528212
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I141c6e1d0585f81e2ab14ad96499beb112eebdb5
2021-01-12 11:26:08 +00:00
Paul Hu
4dbc0c0343
Merge "Replace NetworkPolicyManagerInternal#isUidNetworkingBlocked()" am: 016c1500f4 am: 1340c9e3d2 am: f2b3fdc064
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535722
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id78638ca2a5384accb7b1b92d70a779fda561b98
2021-01-12 11:25:28 +00:00
Lorenzo Colitti
19281cbdb4
Merge "Remove Vpn#isBlockingUid." am: 57f4dfc101 am: aeeac8d0c7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1528212
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic509770103b1538cdb5a16e8ba0753029c0863b9
2021-01-12 11:12:11 +00:00
Paul Hu
f2b3fdc064
Merge "Replace NetworkPolicyManagerInternal#isUidNetworkingBlocked()" am: 016c1500f4 am: 1340c9e3d2
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535722
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I623a01c29978908b213e888ffebc06f38d5ee085
2021-01-12 11:11:08 +00:00
Treehugger Robot
9240e320b9
Merge "[VCN02] Make LingerTimer takes request Id instead of NetworkRequest" am: 5e27a2f6e3 am: d6033084b2 am: 5303115994
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1529109
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I99aa6ba209a6e051d9c2c9ebf9f2635effaa450b
2021-01-12 11:03:01 +00:00