LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,132 Commits 2 Branches 0 Tags
6039c5aee8ee3632fda7e5a94de49e5ca52462c0
Commit Graph

13132 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
junyulai
d1a7816fa2 [VCN05] Pass request type when requesting network 
Currently, ConnectivityService decides the request type by
whether NetworkCapabilities is null when handling request
network. However, to fulfill the need of firing background
request via ConnectivityManager in the follow-up patches,
the request type is needed to pass into ConnectivityService.

This change also make ConnectivityService utilizes the passed
request type.

Test: atest ConnectivityManagerTest#testRequestType
Bug: 175662146
Change-Id: I3bc172bca1217c8020db45057a621d0745d43b3c
 2021-01-12 19:55:00 +08: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
Lorenzo Colitti
aeeac8d0c7 Merge "Remove Vpn#isBlockingUid." am: 57f4dfc101 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1528212

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2c3745aaf5822a75e4597d7ff326680f9d7c63d7
 2021-01-12 10:25:46 +00:00
Paul Hu
1340c9e3d2 Merge "Replace NetworkPolicyManagerInternal#isUidNetworkingBlocked()" am: 016c1500f4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535722

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id0936169def9a3ec1fe5895f948fc2a776a0deec
 2021-01-12 10:22:27 +00:00
Lorenzo Colitti
57f4dfc101 Merge "Remove Vpn#isBlockingUid." 2021-01-12 10:20:33 +00:00
Treehugger Robot
5303115994 Merge "[VCN02] Make LingerTimer takes request Id instead of NetworkRequest" am: 5e27a2f6e3 am: d6033084b2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1529109

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1388064603ed3df9719997522e53ffb7b4903b25
 2021-01-12 10:05:35 +00:00
Paul Hu
016c1500f4 Merge "Replace NetworkPolicyManagerInternal#isUidNetworkingBlocked()" 2021-01-12 09:53:05 +00:00
Treehugger Robot
d6033084b2 Merge "[VCN02] Make LingerTimer takes request Id instead of NetworkRequest" am: 5e27a2f6e3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1529109

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I01c9c7e2b8022f2fbec610934e43245cda3483be
 2021-01-12 09:40:36 +00:00
Treehugger Robot
5e27a2f6e3 Merge "[VCN02] Make LingerTimer takes request Id instead of NetworkRequest" 2021-01-12 08:59:04 +00:00
Treehugger Robot
f2b8791703 Merge "Improve error message when testing network factory" am: 5c19af924e am: 00545d7629 am: d89648a6cc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531798

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4b421f7b2895a24912d37d73dc011fa440440cf2
 2021-01-12 05:31:18 +00:00
Treehugger Robot
d89648a6cc Merge "Improve error message when testing network factory" am: 5c19af924e am: 00545d7629 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531798

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1b867dec65d458d248706b4118f8d23055eea3a8
 2021-01-12 05:13:18 +00:00
Treehugger Robot
00545d7629 Merge "Improve error message when testing network factory" am: 5c19af924e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1531798

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I80d0f3bd9ef8c9da1d311b001d2c42a5d1652e08
 2021-01-12 04:18:22 +00:00
Treehugger Robot
5c19af924e Merge "Improve error message when testing network factory" 2021-01-12 03:50:30 +00:00
Remi NGUYEN VAN
00816cf5d9 Merge "Revert^2 "Move service-connectivity to the tethering APEX"" am: fd834aa031 am: 6508b373ee am: 4e0db1b874 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542626

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I81a7577b0cf474bbb53ca38ddd093ba4342ab543
 2021-01-12 03:42:16 +00:00
paulhu
3b063e3640 Replace NetworkPolicyManagerInternal#isUidNetworkingBlocked() 
Connectivity service is going to become a mainline module which
will not able to access hidden APIs. NetworkPolicyManagerInternal
is a internal serivce that CS can't be access after be a mainline
module. Thus, replace NPMI#isUidNetworkingBlocked() to similar
method NPMS#isUidNetworkingBlocked() and create new API
NPM#isUidNetworkingBlocked() to support CS usage.

Bug: 170598012
Test: atest FrameworksNetTests
Test: atest FrameworksCoreTests:NetworkPolicyManagerTest
Test: atest FrameworksServicesTests:NetworkPolicyManagerServiceTest
Test: atest CtsNetTestCases
Test: atest CtsHostsideNetworkTests
Change-Id: Ic3427c71c395de787320f303c9513874b4d64f98
 2021-01-12 10:53:05 +08:00
Hai Shalom
492febbfa2 Support for Venue URL and friendly name from Network agent 
Extend CaptivePortalData with a member to hold the venue friendly
name. If CaptivePortalData is initialized by both the network
agent and Capport, merge the two objects to include the venue
friendly name and prioritize the venue URL from the network
agent.

Bug: 162783305
Test: atest ConnectivityServiceTest
Test: atest CtsNetTestCasesLatestSdk:CaptivePortalDataTest
Test: End-to-end test
Change-Id: I4fdf356be42237c5b6c0ae5bacfd3cec4726861b
 2021-01-11 18:45:34 -08:00
Remi NGUYEN VAN
4e0db1b874 Merge "Revert^2 "Move service-connectivity to the tethering APEX"" am: fd834aa031 am: 6508b373ee 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542626

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0b44d8e25e3f0a4d596cef2befea52c2606c9a58
 2021-01-12 02:21:57 +00:00
Remi NGUYEN VAN
6508b373ee Merge "Revert^2 "Move service-connectivity to the tethering APEX"" am: fd834aa031 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542626

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5dc50e0510e1716db733fec6fa56adfe91ac4cc0
 2021-01-12 02:05:59 +00:00
Remi NGUYEN VAN
fd834aa031 Merge "Revert^2 "Move service-connectivity to the tethering APEX"" 2021-01-12 01:35:30 +00:00
Jeff DeCew
2c92a7415a Merge "Show LargeIcon as wide for apps targeting S." 2021-01-08 20:57:53 +00:00
Junyu Lai
611f6e7819 Merge "Revert "wifi: Add systemAPi:setSubscriberId in NetworkAgentConfig"" am: f44c7cc998 am: 7acae7b049 am: c575215274 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542628

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib7ca2c9482b3d4c6e50975825239ca9bc461991b
 2021-01-08 15:15:51 +00:00
Junyu Lai
c575215274 Merge "Revert "wifi: Add systemAPi:setSubscriberId in NetworkAgentConfig"" am: f44c7cc998 am: 7acae7b049 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542628

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I66fba706c6a8f78344026eac490ad266f838c21f
 2021-01-08 14:52:54 +00:00
Junyu Lai
7acae7b049 Merge "Revert "wifi: Add systemAPi:setSubscriberId in NetworkAgentConfig"" am: f44c7cc998 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542628

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie7b3dbf38a38a0ac0b1cfa86822a5eb3318b0990
 2021-01-08 14:29:39 +00:00
Treehugger Robot
19efed5fab Merge "Pivot network statistics to use DataInput/Output." am: 14b8536eb3 am: 67ae1d500b am: 2ac863a446 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540224

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I44be7ea64d012f35d312ae3b039b0fd7e37e9d60
 2021-01-08 11:49:37 +00:00
Treehugger Robot
2ac863a446 Merge "Pivot network statistics to use DataInput/Output." am: 14b8536eb3 am: 67ae1d500b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540224

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic0502659732c1957b297095a5332e6dc0b514397
 2021-01-08 11:33:57 +00:00
Junyu Lai
3bd1e4ffb1 Revert "wifi: Add systemAPi:setSubscriberId in NetworkAgentConfig" 
This reverts commit b36c519c4c.

Reason for revert: After discussion, we prefer to add a field in NetworkCapabilities instead. Sorry for inconvenience.

Change-Id: I2e8840a797df9d1594f2b8b576bcd45beb184fca
 2021-01-08 19:22:28 +08:00
Treehugger Robot
67ae1d500b Merge "Pivot network statistics to use DataInput/Output." am: 14b8536eb3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540224

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I86021070223e8825ba19bd84946ef89b56dc3f35
 2021-01-08 10:56:59 +00:00
Les Lee
fe65e2d5c9 Merge "wifi: Add systemAPi:setSubscriberId in NetworkAgentConfig" am: 51115a8705 am: 78df78fef9 am: 7604c6c0ac 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536153

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8a491c13545e1dbe09f46081303dc33eed71a467
 2021-01-08 10:41:27 +00:00
Treehugger Robot
14b8536eb3 Merge "Pivot network statistics to use DataInput/Output." 2021-01-08 10:33:16 +00:00
Les Lee
7604c6c0ac Merge "wifi: Add systemAPi:setSubscriberId in NetworkAgentConfig" am: 51115a8705 am: 78df78fef9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536153

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4f4e7bfc059df3415378179b3d70ca35b8ebf4f1
 2021-01-08 10:10:29 +00:00
Lorenzo Colitti
db35103974 Remove Vpn#isBlockingUid. 
This code is no longer used. Delete it and the tests for it.

One of the tests checks that when a restricted profile is added,
the lockdown UID rules are updated to cover that profile as well.
ConnectivityServiceTest does not currently has coverage for this,
so add it.

Bug: 173331190
Test: moved unit test from VpnTest to ConnectivityServiceTest
Change-Id: Ic350b90946870890bf031668bb5c201037b0bd15
 2021-01-08 15:35:55 +09:00
Les Lee
78df78fef9 Merge "wifi: Add systemAPi:setSubscriberId in NetworkAgentConfig" am: 51115a8705 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536153

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I59ab8adad819038715f7534ac746edbf923a92b9
 2021-01-08 01:26:56 +00:00
Remi NGUYEN VAN
5b2ea5d193 Revert^2 "Move service-connectivity to the tethering APEX" 
As part of modularization of ConnectivityService and expansion of the
Tethering module scope, move service-connectivity.jar into the tethering
APEX, and load it from there.

This rolls forward the change. The original topic was reverted because
of a bad merged-in clause; this is fixed and re-verified in this topic.

Bug: 171540887
Test: m, device boots and connectivity

Change-Id: I293b09c0dc04c6ccafa30cd0f1a63efe32283604
 2021-01-08 01:23:36 +00:00