Commit Graph

8331 Commits

Author SHA1 Message Date
Cody Kesting
89031bc74c Merge "Decrement networkRequestPerUid when callbacks are unregistered." am: dcf92c32c6 am: 21f7dba1e1
Change-Id: Iab77f83a544c2e0b6729f84c16cfd57f7f98dc64
2020-03-31 00:52:29 +00:00
Cody Kesting
ea729736d1 Merge "Invoke onConnectivityReport on registering ConnectivityDiagnostics." am: a365c81bfa am: 7439991aec
Change-Id: I977106391a0723c2c105cd592ef67b6bf240abed
2020-03-31 00:51:43 +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
6b74605335 Merge "Clean up handling of NetworkCapabilities#administratorUids." am: eb0b80c9e5 am: 2ea7a457b0
Change-Id: I136e69cd6e1e64b93eed339efe92c38817cf2d00
2020-03-30 22:50:52 +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
96236d25ff Merge "Update constructor of NetworkMonitor" am: 3402ee64ed am: 63f5da7bb6
Change-Id: Ideb37b2e9cdcfbbb35919ac1e7ba0175166d3d61
2020-03-30 09:12:26 +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
6d27040af9 Merge "Fix NetworkCapabilitiesTest fail on Q device" am: b1bf1f2d36 am: 4c3ce3670c
Change-Id: I30e0cfc16e45eaeb03b71098314d6cdcedef84f5
2020-03-30 08:20:59 +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
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
Lucas Lin
b1bf1f2d36 Merge "Fix NetworkCapabilitiesTest fail on Q device" 2020-03-30 07:41:01 +00:00
Aaron Huang
e59bf917ad Merge "Make LinkPropertiesTest compatible with Q" am: 9d66de5d5e am: a6bdfda91b
Change-Id: Iaf17474f9682c46c0a62870fd9f652e554bcf4a6
2020-03-30 06:39:00 +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
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
b07bc307ac Merge "Add MatchAllNetworkSpecifierTest" am: 28ff516ba7 am: b98484701c
Change-Id: I0bfc89780d632420b0d543addf02e3418a2e6227
2020-03-30 03:26:13 +00:00
Lucas Lin
76de673055 Merge "Add more tests in LinkPropertiesTests.java" am: 246821b7b4 am: 42cf91c65f
Change-Id: I744c43208f3e13de5ab2b974e64e8a95e7fe640a
2020-03-30 03:26:05 +00:00
Lucas Lin
b98484701c Merge "Add MatchAllNetworkSpecifierTest" am: 28ff516ba7
Change-Id: I189592ddfaa5ad75e0613f8b8468022a3af885c7
2020-03-30 03:15:44 +00:00
Remi NGUYEN VAN
0a55ab853b Merge "Create a builder for NetworkCapabilities." am: e3aade0a30 am: 8b5ae551f9
Change-Id: I2b7646ff87886123230699d306005377858a1c04
2020-03-30 03:15:13 +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
2c9ea364d7 Merge "Unbreak testStartUsingNetworkFeature_enableHipri failure" am: 0b3d643758 am: d53c48616f
Change-Id: I10d2abef918f0f8c6a4fad2297cc4517e10c7d29
2020-03-27 15:59:05 +00:00
Mark Chien
d53c48616f Merge "Unbreak testStartUsingNetworkFeature_enableHipri failure" am: 0b3d643758
Change-Id: I30eefa35d19f0a2dd8382fc3f63470d1aeb0dea9
2020-03-27 15:45:06 +00:00
Mark Chien
0b3d643758 Merge "Unbreak testStartUsingNetworkFeature_enableHipri failure" 2020-03-27 15:28:09 +00:00
markchien
9eb9399321 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 oder SDK(< M).

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

Change-Id: I367dff0429f26f266282300edc38637b55eece38
2020-03-27 14:15:13 +00:00
Daulet Zhanguzin
9f337c4734 Merge "Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull" am: 053fb7317e am: 658f6d9465
Change-Id: I024e79fc24b8962ff6bd10e4b7c7fc4ad13cbf27
2020-03-27 12:27:58 +00:00
Daulet Zhanguzin
658f6d9465 Merge "Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull" am: 053fb7317e
Change-Id: I9f9ba24036e19f568942466c866c7be23112c10a
2020-03-27 12:07:53 +00:00
Daulet Zhanguzin
053fb7317e Merge "Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull" 2020-03-27 11:53:39 +00:00
Aaron Huang
7988471ec9 Make LinkPropertiesTest compatible with Q
CompareResult had been moved from LinkProperties to LinkPropertiesUtils
so this change ignores testCompareResult() on Q and only check
compareAllRoutes() works while android version is at least R.

Bug: 151782584
Test: atest CtsNetTestCasesLatestSdk:LinkPropertiesTest
Change-Id: I38b0d83abf983b3bcc01fc6aea2e5cc307734198
2020-03-27 16:41:21 +08:00
Aaron Huang
d376174b86 Merge "API review: access field by method" am: a09a992749 am: d9f35a57b5
Change-Id: I60e7f467251e2c33f62967edd1c029321eb6e369
2020-03-27 07:47:32 +00:00
Aaron Huang
d9f35a57b5 Merge "API review: access field by method" am: a09a992749
Change-Id: I68041686393f73a38dcd49f6fcd5bd5930f6054d
2020-03-27 07:24:02 +00:00
Aaron Huang
a09a992749 Merge "API review: access field by method" 2020-03-27 07:03:25 +00:00
Daulet Zhanguzin
ee67425c05 Replace com.android.internal.util.Preconditions.checkNotNull with
java.util.Objects.requireNonNull

Bug: 126528330
Bug: 149348618

Test: Treehugger
Change-Id: Idb1b6ba41af3b52f3376b1157259af3c30328c4e
Merged-In: Idb1b6ba41af3b52f3376b1157259af3c30328c4e
2020-03-26 12:44:56 +00:00
lucaslin
55c6a844fc Add more tests in LinkPropertiesTests.java
Test getAllInterfaceNames(), hasIpv4DefaultRoute(),
hasIpv4DnsServer() and hasIpv6DnsServer().

Bug: 139268426
Bug: 135998869
Bug: 138306002
Test: atest CtsNetTestCasesLatestSdk:android.net.LinkPropertiesTest
Change-Id: Ie77dd7eb5c7ecc763c661e8510f9a308e695e77f
2020-03-26 19:15:55 +08:00
lucaslin
5bf0d2de9d Add MatchAllNetworkSpecifierTest
Bug: 139268426
Bug: 135998869
Test: atest CtsNetTestCasesLatestSdk:MatchAllNetworkSpecifierTest
Change-Id: Ib593708d5621ff20e6a0c31e5698b2b658f64d45
2020-03-26 18:58:08 +08:00
Xiao Ma
f6576f9d6f Merge "Add CTS tests for ApfCapabilities static APIs." am: 854b55854b am: 1b7eddd68e
Change-Id: Ib8d64777cd5db1ca5e2870964e4a8f65fa5400ef
2020-03-26 01:36:51 +00:00
Xiao Ma
1b7eddd68e Merge "Add CTS tests for ApfCapabilities static APIs." am: 854b55854b
Change-Id: I6679b26173339eb6fbb9fa0b08de7f9fb0751148
2020-03-26 01:36:06 +00:00
Xiao Ma
854b55854b Merge "Add CTS tests for ApfCapabilities static APIs." 2020-03-26 01:22:05 +00:00
Chalard Jean
c89cc407ef Merge "Allow MANAGE_TEST_NETWORKS to register limited agents" am: a982d12943 am: 3870a078e3
Change-Id: I3e4b845af64f8e35ba0aa381f43b0e3ca939e6eb
2020-03-25 10:49:54 +00:00