Commit graph

13,045 commits

Message SHA1
[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

junyulai   commited 2021-01-13 11:05:40 +08:00
869e7020a0
NetworkCapabilities: Embed location senstive TransportInfo
Changes:
i) Add a new constructor for NetworkCapabilities which accepts whether
location sensitive fields need to be parceled or not. Defalts to false
on the other constructor. This boolean should only be set on the copy of
NetworkCapabilities when sent to apps that hold location permission.
(Similar to how sensitive fields are handled in LinkProperties)
ii) Add a new makeCopy() method in the TransportInfo interface which
accepts whether location sensitive fields need to be parceled or not.
iii) Migrate the existing NetworkCapabilities owner UID masking to use
this new mechanism (instead of existing masking in ConnectivityService).
iv) Always set parcelLocationSensitiveFields to true in the NetworkAgent
surface (since that is a privileged surface from the transports to the
connectivity service)
v) Add a hasSensitiveFields() in TransportInfo interface to avoid
perfoming location permission checks for location insensitive
TrasnsportInfo.

Also, migrate to the new SdkLevel util for isAtLeastR() & isAtLeastS()
checks.

Bug: 162602799
Test: atest android.net
Test: atest com.android.server
Change-Id: Ie522d8c75a82ae521ccfd5165823d0c72642e651
Merged-In: Ie522d8c75a82ae521ccfd5165823d0c72642e651

Roshan Pius   commited 2021-01-13 02:25:49 +00:00
423fff6300
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

Hai Shalom   authored and   Automerger Merge Worker   commited 2021-01-13 02:09:39 +00:00
5485906661
Merge "Support for Venue URL and friendly name from Network agent"
Hai Shalom   authored and   Gerrit Code Review   commited 2021-01-13 01:54:05 +00:00
6fce4189cd
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

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2021-01-13 00:49:30 +00:00
6158fa695f
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

Lorenzo Colitti   commited 2021-01-13 09:39:01 +09:00
a68139ae1b
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

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2021-01-13 00:34:09 +00:00
a619c0c2d7
Merge changes I3eb82680,I9d6147d9
* changes:
  NetworkWatchlistServiceTests: update IIpConnectivityMetrics.
  Stop using IIpConnectivityMetrics in ConnectivityService.

Lorenzo Colitti   authored and   Gerrit Code Review   commited 2021-01-13 00:31:56 +00:00
013be9d6c8
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

Tomasz Wasilczyk   authored and   Automerger Merge Worker   commited 2021-01-12 23:04:07 +00:00
0c90d69a61
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

Ken Chen   authored and   Automerger Merge Worker   commited 2021-01-12 23:03:49 +00:00
9d2c783e91
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

Tomasz Wasilczyk   authored and   Automerger Merge Worker   commited 2021-01-12 22:43:41 +00:00
fad6801459
Merge "Keep Vehicle internal network always up"
Tomasz Wasilczyk   authored and   Gerrit Code Review   commited 2021-01-12 22:40:50 +00:00
2602edad73
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

Ken Chen   authored and   Automerger Merge Worker   commited 2021-01-12 22:39:07 +00:00
968c4ed867
Keep Vehicle internal network always up
Bug: 171801262
Test: Boot with and without overlay set and check ifconfig
Change-Id: I1fd332caf3e09924abcfec9c2c137363be7873e4

Tomasz Wasilczyk   commited 2021-01-12 10:33:38 -08:00
2793ab9e5b
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

Ken Chen   commited 2021-01-12 23:50:28 +08:00
b8e4bc9c3f
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

Lorenzo Colitti   commited 2021-01-12 23:19:49 +09:00
d9932a7da8
[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

junyulai   commited 2021-01-12 19:55:00 +08:00
d1a7816fa2
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

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2021-01-12 11:12:11 +00:00
19281cbdb4
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

Paul Hu   authored and   Automerger Merge Worker   commited 2021-01-12 11:11:08 +00:00
f2b3fdc064
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

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2021-01-12 10:25:46 +00:00
aeeac8d0c7
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

Paul Hu   authored and   Automerger Merge Worker   commited 2021-01-12 10:22:27 +00:00
1340c9e3d2
Merge "Remove Vpn#isBlockingUid."
Lorenzo Colitti   authored and   Gerrit Code Review   commited 2021-01-12 10:20:33 +00:00
57f4dfc101
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

Treehugger Robot   authored and   Automerger Merge Worker   commited 2021-01-12 10:05:35 +00:00
5303115994
Merge "Replace NetworkPolicyManagerInternal#isUidNetworkingBlocked()"
Paul Hu   authored and   Gerrit Code Review   commited 2021-01-12 09:53:05 +00:00
016c1500f4
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

Treehugger Robot   authored and   Automerger Merge Worker   commited 2021-01-12 09:40:36 +00:00
d6033084b2
Merge "[VCN02] Make LingerTimer takes request Id instead of NetworkRequest"
Treehugger Robot   authored and   Gerrit Code Review   commited 2021-01-12 08:59:04 +00:00
5e27a2f6e3
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

Treehugger Robot   authored and   Automerger Merge Worker   commited 2021-01-12 05:13:18 +00:00
d89648a6cc
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

Treehugger Robot   authored and   Automerger Merge Worker   commited 2021-01-12 04:18:22 +00:00
00545d7629
Merge "Improve error message when testing network factory"
Treehugger Robot   authored and   Gerrit Code Review   commited 2021-01-12 03:50:30 +00:00
5c19af924e
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

paulhu   commited 2021-01-12 10:53:05 +08:00
3b063e3640
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

Hai Shalom   commited 2021-01-11 18:45:34 -08:00
492febbfa2
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

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2021-01-12 02:21:57 +00:00
4e0db1b874
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

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2021-01-12 02:05:59 +00:00
6508b373ee
Merge "Revert^2 "Move service-connectivity to the tethering APEX""
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2021-01-12 01:35:30 +00:00
fd834aa031
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

Junyu Lai   authored and   Automerger Merge Worker   commited 2021-01-08 14:52:54 +00:00
c575215274
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

Junyu Lai   authored and   Automerger Merge Worker   commited 2021-01-08 14:29:39 +00:00
7acae7b049
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

Treehugger Robot   authored and   Automerger Merge Worker   commited 2021-01-08 11:33:57 +00:00
2ac863a446
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

Junyu Lai   authored and   junyulai   commited 2021-01-08 19:22:28 +08:00
3bd1e4ffb1
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

Treehugger Robot   authored and   Automerger Merge Worker   commited 2021-01-08 10:56:59 +00:00
67ae1d500b
Merge "Pivot network statistics to use DataInput/Output."
Treehugger Robot   authored and   Gerrit Code Review   commited 2021-01-08 10:33:16 +00:00
14b8536eb3
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

Les Lee   authored and   Automerger Merge Worker   commited 2021-01-08 10:10:29 +00:00
7604c6c0ac
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

Lorenzo Colitti   commited 2021-01-08 15:35:55 +09:00
db35103974
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

Les Lee   authored and   Automerger Merge Worker   commited 2021-01-08 01:26:56 +00:00
78df78fef9
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

Remi NGUYEN VAN   commited 2021-01-08 01:23:36 +00:00
5b2ea5d193
Merge "wifi: Add systemAPi:setSubscriberId in NetworkAgentConfig"
Les Lee   authored and   Gerrit Code Review   commited 2021-01-08 00:54:51 +00:00
51115a8705
Merge changes Iec22ff63,Iaca8a7cc am: 0cec61c277 am: de3c1f6764
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1528211

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iad0d78dd0787d8eb1da38c208588414b7dfbbdac

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2021-01-07 18:48:31 +00:00
6aacbaac9c
Merge "Merge changes from topic "revert-1532910-connectivity_jar_in_apex-LKXFLQGLIU" am: 7de72f8875" into stage-aosp-master am: ba42f64156
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541542

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie22d1281939b2191304ecf3c9c8de54913f6aafe

Automerger Merge Worker   commited 2021-01-07 18:48:02 +00:00
ec5f9aed57
Merge changes from topic "revert-1532910-connectivity_jar_in_apex-LKXFLQGLIU" am: 7de72f8875 am: 56586b16dd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1541542

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie8e753e64eefa3a3d30a31af30c437411bf59ece

Treehugger Robot   authored and   Automerger Merge Worker   commited 2021-01-07 18:48:00 +00:00
977ceb563f
Merge changes Iec22ff63,Iaca8a7cc am: 0cec61c277
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1528211

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1a7da1cab20a38cec3e9610a537c6ba9d7a8308d

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2021-01-07 18:16:43 +00:00
de3c1f6764
Merge "Merge changes from topic "revert-1532910-connectivity_jar_in_apex-LKXFLQGLIU" am: 7de72f8875" into stage-aosp-master
Automerger Merge Worker   authored and   Android (Google) Code Review   commited 2021-01-07 18:10:58 +00:00
ba42f64156