Commit Graph

9087 Commits

Author SHA1 Message Date
Benedict Wong
a6130d4a68 Merge "Make VpnProfile.maxMtu default value match Ikev2VpnProfile" am: 0943dac366 am: 538a86d63e
Change-Id: I51a3ec89f215dd937357e5a77f679a063a7b8a18
2020-03-31 03:06:19 +00:00
Benedict Wong
538a86d63e Merge "Make VpnProfile.maxMtu default value match Ikev2VpnProfile" am: 0943dac366
Change-Id: I525f947ce90d44c286a61d05297dd205e706a319
2020-03-31 02:37:52 +00:00
Benedict Wong
0943dac366 Merge "Make VpnProfile.maxMtu default value match Ikev2VpnProfile" 2020-03-31 02:22:54 +00:00
Cody Kesting
f6adaa4185 Merge "Decrement networkRequestPerUid when callbacks are unregistered." am: dcf92c32c6 am: 21f7dba1e1
Change-Id: I10185578b859218680168cffdfcd8cd0f24de09c
2020-03-31 00:55:06 +00:00
Cody Kesting
22f3171c07 Merge "Invoke onConnectivityReport on registering ConnectivityDiagnostics." am: a365c81bfa am: 7439991aec
Change-Id: Ib65d67f8d9a6e44d03f745cdcb27d7535fd40c58
2020-03-31 00:54:30 +00:00
Cody Kesting
21f7dba1e1 Merge "Decrement networkRequestPerUid when callbacks are unregistered." am: dcf92c32c6
Change-Id: I1ac0276aa434748dbb22b82f0c4aca917875b168
2020-03-31 00:26:01 +00:00
Cody Kesting
7439991aec Merge "Invoke onConnectivityReport on registering ConnectivityDiagnostics." am: a365c81bfa
Change-Id: I2d3e6be0923ec2a0d3197f71fb2d3149c40a5eea
2020-03-31 00:25:24 +00:00
Cody Kesting
dcf92c32c6 Merge "Decrement networkRequestPerUid when callbacks are unregistered." 2020-03-31 00:07:01 +00:00
Cody Kesting
a365c81bfa Merge "Invoke onConnectivityReport on registering ConnectivityDiagnostics." 2020-03-31 00:06:26 +00:00
Cody Kesting
5c96dc912b Merge "Clean up handling of NetworkCapabilities#administratorUids." am: eb0b80c9e5 am: 2ea7a457b0
Change-Id: Ie2e85fc61fe3765beebcc511f2256bd6b4c37b1f
2020-03-30 22:50:39 +00:00
Cody Kesting
2ea7a457b0 Merge "Clean up handling of NetworkCapabilities#administratorUids." am: eb0b80c9e5
Change-Id: I69f1061972af362560a274084c94428b57bd46e8
2020-03-30 22:27:30 +00:00
Cody Kesting
eb0b80c9e5 Merge "Clean up handling of NetworkCapabilities#administratorUids." 2020-03-30 22:04:43 +00:00
Cody Kesting
46cb167e08 Decrement networkRequestPerUid when callbacks are unregistered.
ConnectivityDiagnosticsCallbacks are tied to NetworkRequestInfo objects
when registered with the platform. Each NetworkRequestInfo is tied to a
specific uid, and ConnectivityService enforces a limit on the number of
network requests that can be associated with each uid.

When ConnectivityDiagnosticsCallbacks are unregistered from the
platform, their NetworkRequestInfo is freed and the number of network
requests per the user's uid should be decremented.

Bug: 150802582
Test: atest android.net.cts.ConnectivityDiagnosticsManagerTest
Change-Id: Ia5ed39c1d8e6221cd402be4f8baf69fa643a6113
2020-03-30 11:10:46 -07:00
Cody Kesting
b77bf707c6 Invoke onConnectivityReport on registering ConnectivityDiagnostics.
This change updates the behavior for registering
ConnectivityDiagnosticsCallbacks. Now, after a successful register()
call, callbacks will receive cached ConnectivityReports for all
matching, permissioned networks. This allows registrants to be updated
with the network state for their networks without having to wait for the
next network validation.

Bug: 147849853
Test: atest FrameworksNetTests
Change-Id: I924ba8fdcc847f453557021591bde38602fe089c
2020-03-30 11:10:46 -07:00
Cody Kesting
7b987276db Clean up handling of NetworkCapabilities#administratorUids.
Update ConnectivityService's check for administrator UIDs to use
ArrayUtils to check for UID inclusion. Update the NetworkCapabilities
annotation on the administrator UIDs field to clarify that it is
NonNull.

Bug: 147903575
Test: atest FrameworksNetTests
Change-Id: Id630fe9d76aacdaf038fdaa5360f0327520ee0c3
2020-03-30 16:55:21 +00:00
Chiachang Wang
42368e5de2 Merge "Update constructor of NetworkMonitor" am: 3402ee64ed am: 63f5da7bb6
Change-Id: I59f68083d374afc1d0bf38cc6abd5fe4cbe068d1
2020-03-30 09:12:37 +00:00
Chiachang Wang
63f5da7bb6 Merge "Update constructor of NetworkMonitor" am: 3402ee64ed
Change-Id: I5ef9b48946acb83ada644600117c604028a5c0b5
2020-03-30 08:56:34 +00:00
Chiachang Wang
3402ee64ed Merge "Update constructor of NetworkMonitor" 2020-03-30 08:40:45 +00:00
Lucas Lin
66dc3653df [automerger skipped] Merge "Fix NetworkCapabilitiesTest fail on Q device" am: b1bf1f2d36 am: 4c3ce3670c -s ours
am skip reason: Change-Id I602ae32dae1ad29fe3293c541fa6d2cef01b81d3 with SHA-1 88cef1a242 is in history

Change-Id: Id82ae0b4426104a64758a9426e165d1c69087379
2020-03-30 08:20:35 +00:00
Lucas Lin
4c3ce3670c Merge "Fix NetworkCapabilitiesTest fail on Q device" am: b1bf1f2d36
Change-Id: I591b621bb8b659aa7d0c163b20d03952589db428
2020-03-30 08:06:30 +00:00
Xiao Ma
b57e276a52 [automerger skipped] Merge "Add CTS tests for ApfCapabilities static APIs." into rvc-dev am: 18511e3b08 -s ours
am skip reason: Change-Id I11555934df4b27cbb6b7ddbb81022d8fb7c25e15 with SHA-1 07a17aaa51 is in history

Change-Id: Ieb1ca59f2c72ac7ce731544cffeb8d48ad40561c
2020-03-30 08:06:18 +00:00
Chiachang Wang
0ab5158418 Update constructor of NetworkMonitor
Remove redundant parameter.

Bug: 152374582
Test: m -j40 ; atest FrameworksNetIntegrationTests
Change-Id: I3a636f0ea5145ac4435e06a9827bb8e01862542d
2020-03-30 07:52:02 +00:00
Xiao Ma
18511e3b08 Merge "Add CTS tests for ApfCapabilities static APIs." into rvc-dev 2020-03-30 07:46:30 +00:00
Lucas Lin
b1bf1f2d36 Merge "Fix NetworkCapabilitiesTest fail on Q device" 2020-03-30 07:41:01 +00:00
Aaron Huang
3425e2651a Merge "Make LinkPropertiesTest compatible with Q" am: 9d66de5d5e am: a6bdfda91b
Change-Id: Ifab1167a15748d6b774ab9939562e337c73d7da7
2020-03-30 06:38:49 +00:00
Aaron Huang
a6bdfda91b Merge "Make LinkPropertiesTest compatible with Q" am: 9d66de5d5e
Change-Id: I46148a6d1db0a64006cc1e0d829a0d472a37dda3
2020-03-30 06:25:55 +00:00
Aaron Huang
9d66de5d5e Merge "Make LinkPropertiesTest compatible with Q" 2020-03-30 06:06:32 +00:00
Xiao Ma
ef40b406c5 Add CTS tests for ApfCapabilities static APIs.
Add tests for getApfEtherTypeBlackList and getApfDrop8023Frames APIs.

Bug: 150640397
Test: atest CtsNetTestCasesLatestSdk:android.net.apf.ApfCapabilitiesTest
      on both of Q and R devices.

Change-Id: I11555934df4b27cbb6b7ddbb81022d8fb7c25e15
Merged-In: I11555934df4b27cbb6b7ddbb81022d8fb7c25e15
(cherry picked from commit 7d51a72487dba5b2747a9de12f50ba2087007264)
2020-03-30 05:41:02 +00:00
TreeHugger Robot
aa7e7dabc9 [automerger skipped] Merge "Unbreak testStartUsingNetworkFeature_enableHipri failure" into rvc-dev am: 60e3892fec -s ours
am skip reason: Change-Id I367dff0429f26f266282300edc38637b55eece38 with SHA-1 9eb9399321 is in history

Change-Id: Ifc19fecc1f19504a693eb8f2816c529853abbaf3
2020-03-30 04:39:24 +00:00
lucaslin
be8bbacfa2 Fix NetworkCapabilitiesTest fail on Q device
The getSSID() has changed to getSsid() in Android R, adding
isAtLeastR() to prevent NetworkCapabilitiesTest fail on Android
Q.

Bug: 151322799
Test: Run "atest CtsNetTestCasesLatestSdk:NetworkCapabilitiesTest"
      on Android Q & R device.
Change-Id: I602ae32dae1ad29fe3293c541fa6d2cef01b81d3
Merged-In: I602ae32dae1ad29fe3293c541fa6d2cef01b81d3
2020-03-30 03:47:00 +00:00
Lucas Lin
ac0d8ed4e8 Merge "Add MatchAllNetworkSpecifierTest" am: 28ff516ba7 am: b98484701c
Change-Id: I785f9d510b96acbed2925fd1af3b46829c494d1e
2020-03-30 03:42:57 +00:00
Lucas Lin
ec3a3796bf Merge "Add more tests in LinkPropertiesTests.java" am: 246821b7b4 am: 42cf91c65f
Change-Id: I02ba7c8eaeb9218815f12960c1514350b0b27399
2020-03-30 03:42:28 +00:00
Remi NGUYEN VAN
da337f3100 [automerger skipped] Merge "Create a builder for NetworkCapabilities." am: e3aade0a30 am: 8b5ae551f9 -s ours
am skip reason: Change-Id I06eb97e50d5583579b3c26d1365d2dbaec8bfc99 with SHA-1 d7d24015a5 is in history

Change-Id: Id4a9f21ae303960d29835443517cc7ae7c87f470
2020-03-30 03:40:28 +00:00
Lucas Lin
b98484701c Merge "Add MatchAllNetworkSpecifierTest" am: 28ff516ba7
Change-Id: I189592ddfaa5ad75e0613f8b8468022a3af885c7
2020-03-30 03:15:44 +00:00
Lucas Lin
42cf91c65f Merge "Add more tests in LinkPropertiesTests.java" am: 246821b7b4
Change-Id: I9bb5c2c32a363d384cbf89b05ea4b2a41217581e
2020-03-30 03:15:06 +00:00
Lucas Lin
28ff516ba7 Merge "Add MatchAllNetworkSpecifierTest" 2020-03-30 03:08:48 +00:00
Lucas Lin
246821b7b4 Merge "Add more tests in LinkPropertiesTests.java" 2020-03-30 03:08:40 +00:00
Remi NGUYEN VAN
8b5ae551f9 Merge "Create a builder for NetworkCapabilities." am: e3aade0a30
Change-Id: I2c78de7b501edca618441040fbe76e34ce15b08e
2020-03-30 03:06:07 +00:00
Remi NGUYEN VAN
e3aade0a30 Merge "Create a builder for NetworkCapabilities." 2020-03-30 02:58:45 +00:00
Mark Chien
9904c69fa5 Unbreak testStartUsingNetworkFeature_enableHipri failure
aosp/1261619 break legacy API that only supported for SDK which is
smaller than android M, caller need to have network stack permission
to request network with legacy type. Fix failure by whitelist permission
check for the caller who built with order SDK(< M).

Bug: 152229492
Test: atest CtsTetheringTest
      atest ConnectivityManagerLegacyTest# \
      testStartUsingNetworkFeature_enableHipri

Change-Id: I02504c0eed10ee4e08c8fbf032951022255ba5fa
Merged-In: I367dff0429f26f266282300edc38637b55eece38
(cherry picked from commit b1c8acf0d6ba1fe35d8e81673d2c5c24fa2fea79)
2020-03-30 02:26:57 +00:00
Hall Liu
ab3ad14a00 Merge changes from topic "phonestatelistener-limit-rvc-dev" into rvc-dev am: f5d30b7870
Change-Id: I0f8dd0d1f7383e94b394cead42113c848b5b8ad4
2020-03-28 06:50:32 +00:00
Hall Liu
f5d30b7870 Merge changes from topic "phonestatelistener-limit-rvc-dev" into rvc-dev
* changes:
  Add gating, logging for PhoneStateListener's limit
  Institute limit on PhoneStateListener
2020-03-28 06:48:56 +00:00
Hall Liu
f4667b4925 Add gating, logging for PhoneStateListener's limit
Add gating via PlatformCompat and DeviceConfig and logging via
PlatformCompat to the limit instituted on per-process listeners

Fixes: 152074216
Test: atest CtsTelephonyHostCases
Change-Id: I4d6681d90705b68c3349f4124e434a29b50fd3a2
2020-03-27 19:21:51 -07:00
Chalard Jean
ec85550d64 Merge changes from topics "api-fix-networkagent", "networkprovider_api", "satisfiedby" into rvc-dev am: 199c91b659
Change-Id: I041fa5232ac2f653f0ff9070b9bcd924345f9987
2020-03-27 22:56:26 +00:00
Chalard Jean
199c91b659 Merge changes from topics "api-fix-networkagent", "networkprovider_api", "satisfiedby" into rvc-dev
* changes:
  Rename satisfiedBy into canBeSatisfiedBy
  Address further API council comments.
  Update the NetworkProvider API for council comments
2020-03-27 22:50:42 +00:00
Cody Kesting
fec7877661 [automerger skipped] Merge "Clean up unit testing for ConnectivityDiagnostics." into rvc-dev am: 26177212ed -s ours
am skip reason: Change-Id Ie302b1f4f437e819fdd15ec28adb0b56750c2c53 with SHA-1 807ce6621b is in history

Change-Id: I2e8071232c2a866f1c6540cb2d43988d30a4ee65
2020-03-27 19:22:07 +00:00
Cody Kesting
26177212ed Merge "Clean up unit testing for ConnectivityDiagnostics." into rvc-dev 2020-03-27 19:09:00 +00:00
Benedict Wong
ec51fecfe6 Make VpnProfile.maxMtu default value match Ikev2VpnProfile
This change corrects the VpnProfile's maxMtu defaults to match that of
the Ikev2VpnProfile. 1400 is too high as a default, and Settings will
run into an issue here quite often.

Bug: 152573931
Test: FrameworksNetTests passing
Change-Id: I97ba5903b3cc1ed6a21c706ed3d78bd8ecbeee0c
2020-03-27 11:52:40 -07:00
Cody Kesting
3f3c426c35 [automerger skipped] Merge "Restrict VPN Diagnostics callbacks to underlying networks." into rvc-dev am: 5657f9c83c -s ours
am skip reason: Change-Id Ic08cdd2e2532580fda0fd3034e2bdff27e0ff84b with SHA-1 d759ac61ee is in history

Change-Id: I2a85d7ddc2fc3e6594e19591b589014d65b8b6f7
2020-03-27 18:35:43 +00:00
Cody Kesting
5657f9c83c Merge "Restrict VPN Diagnostics callbacks to underlying networks." into rvc-dev 2020-03-27 18:22:20 +00:00