Commit graph android_packages_modules_Co.../framework
Message SHA1
Merge "Add KeepalivePacketData toString()" am: c05d86b850 am: 3a9524fc75
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1982947

Change-Id: I4063610de7f1aaf746b89672c82ca7863ae02521

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-02-15 12:00:35 +00:00
36f3355232
Merge "Add KeepalivePacketData toString()"
Treehugger Robot   authored and   Gerrit Code Review   commited 2022-02-15 10:54:37 +00:00
c05d86b850
Merge "Allow test+other networks to have specifiers" am: 106569b856 am: b4c8b3dc68
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1944724

Change-Id: I6a51f3bf259ae2cd6455f8963bc4753b41cd8eb3

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2022-02-14 06:33:40 +00:00
631300885a
Merge "Allow test+other networks to have specifiers"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2022-02-14 05:31:20 +00:00
106569b856
Merge "Add new methods to redact NetworkCapabilities & LinkProperties" am: d537aa42e1 am: e557fcd5e3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1958890

Change-Id: Ibd3e88c8dfe8fc4b265c49dec6f08df5ea775c81

Jean Chalard   authored and   Automerger Merge Worker   commited 2022-02-12 12:27:58 +00:00
a4a89f1503
Merge "Add new methods to redact NetworkCapabilities & LinkProperties"
Jean Chalard   authored and   Gerrit Code Review   commited 2022-02-12 11:56:36 +00:00
d537aa42e1
Add new methods to redact NetworkCapabilities & LinkProperties
Some system components like VPN need to know how to redact
NetworkCapabilities & LinkProperties that they received from
the system but need to send to third-party applications with
less privilege than themselves. To make sure the redaction is
consistent, expose system API methods to do it that are wired
to the same redaction code used by ConnectivityService.

Bug: 191413541
Test: atest CtsNetTestCases, which includes new CTS for these
Change-Id: Ia3ae4755b5192884c147d6828f96cedac000a25b

lucaslin   authored and   Chalard Jean   commited 2022-02-12 15:21:13 +09:00
c582d50b8e
Add KeepalivePacketData toString()
Test: build
Bug: 218569712
Change-Id: I24c0e7ab94212ddf71812ebcc81a5fa69abfa860

Ling Ma   commited 2022-02-11 19:17:10 +00:00
4d782d6d74
Merge "Add @SupressLint to get around incorrect warning."
James Mattis   authored and   Gerrit Code Review   commited 2022-02-10 22:26:06 +00:00
38872800dd
Merge "Add visibility for core tests"
Junyu Lai   authored and   Gerrit Code Review   commited 2022-02-10 09:23:57 +00:00
d54fcc49a7
Merge "[MS55.2] Move NetworkStateSnapshot into module folder"
Treehugger Robot   authored and   Gerrit Code Review   commited 2022-02-10 05:02:45 +00:00
a8ae24410d
Merge "Change naming of excludeLocalRoutes" am: 84ad04f768 am: c1ae7a1047
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1976348

Change-Id: If7d654a347b562859389a171c1d36b82580f2038

Chiachang Wang   authored and   Automerger Merge Worker   commited 2022-02-10 01:39:12 +00:00
5ea7f1eb32
Merge "Change naming of excludeLocalRoutes"
Chiachang Wang   authored and   Gerrit Code Review   commited 2022-02-10 00:50:30 +00:00
84ad04f768
Add @SupressLint to get around incorrect warning.
EthernetNetworkSpecifier is being moved from being @SystemApi to public.
This is causing the linter to incorrectly throw errors when building on
erro prone. Add @SupressLint to the method causing the errors prevents
the incorrect warning from causing build failures.

Tracking bug b/193460475 - TODO to remove once fixed.

cherry pick of http://ag/16822701

Bug: 210485380
Test: build errorprone
Change-Id: Id297e739a2288ccc232c6b989ec7fee41837a910
Merged-In: Id297e739a2288ccc232c6b989ec7fee41837a910

James Mattis   commited 2022-02-09 11:22:11 -08:00
d8afb66b11
Merge changes from topic "bandwidth-limiting" am: 6b5b7b40d8 am: 4eeea56e39
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1955585

Change-Id: I059668f6f5d5c1fa2faa3e2bca2f062f78cb4314

Patrick Rohr   authored and   Automerger Merge Worker   commited 2022-02-09 18:33:22 +00:00
e5e904ee28
Merge changes from topic "bandwidth-limiting"
* changes:
  Add bandwidth limiting to CS
  Add setting that controls network rate limit

Patrick Rohr   authored and   Gerrit Code Review   commited 2022-02-09 18:00:04 +00:00
6b5b7b40d8
Merge "Mark NetworkAgentConfig fit for inclusion in stable AIDL" am: 66fbc7df52 am: bf59fea68f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1975026

Change-Id: I1e8e1cb0125fec38200c1f626407ca4c4057941a

Jean Chalard   authored and   Automerger Merge Worker   commited 2022-02-09 17:27:55 +00:00
0b97b13e47
Merge "Mark NetworkAgentConfig fit for inclusion in stable AIDL"
Jean Chalard   authored and   Gerrit Code Review   commited 2022-02-09 16:55:44 +00:00
66fbc7df52
Add visibility for core tests
Allow core tests to use hidden connectivity APIs. Benchmark tests in
particular cannot be run without these.

Ignore-AOSP-First: Avoiding merge conflicts, cherry-pick will follow
Bug: 197717846
Test: m
  (cherry-picked from ag/16772124)
Change-Id: Ia01f24317d14b063f9a7e24c3ada11b140641c50
Merged-In: Ia01f24317d14b063f9a7e24c3ada11b140641c50

Remi NGUYEN VAN   authored and   junyulai   commited 2022-02-09 23:08:37 +08:00
85a4e07826
Add setting that controls network rate limit
The INGRESS_RATE_LIMIT_BYTES_PER_SECOND setting controls the rate limit
for internet networks. If set to -1, no rate limit applies.  There is
one global rate limit that will be applied to all networks with
NET_CAPABILITY_INTERNET.

Test: atest ConnectivitySettingsManagerTest
Bug: 157552970
Change-Id: Ia82aa867686d484ce46734f76d4a48bf864eff84

Patrick Rohr   commited 2022-02-09 14:46:26 +01:00
a20843638f
[MS55.2] Move NetworkStateSnapshot into module folder
framework-connectivity need to see the aidl files when
compiling IConnectivityManager.aidl, and it can only
include the files by specifying aidl include_dirs.
Thus, move the file into the module since the one outside
of the module is going to be deleted soon.

Ignore-AOSP-First: Avoiding conflicts; cherry-pick will follow
Test: TH
Bug: 197717846
Change-Id: Ide7431d0c98aebd389bee86d13ff44f5ef8b8283
Merged-In: Ide7431d0c98aebd389bee86d13ff44f5ef8b8283

Junyu Lai   commited 2022-02-09 10:51:37 +00:00
dc0d521f63
Merge "Have connectivity targets be visible to Frameworks[Vcn|Ike]Tests"
Aaron Huang   authored and   Gerrit Code Review   commited 2022-02-09 10:48:45 +00:00
e25900bbbf
Merge "Add @SupressLint to get around incorrect warning."
Jean Chalard   authored and   Android (Google) Code Review   commited 2022-02-09 08:48:15 +00:00
ea0f45e941
Change naming of excludeLocalRoutes
Address API review feedback to change naming of
setExcludedLocalRoutesVpn and getter.

Bug: 217742354
Test: atest FrameworksNetTests
Change-Id: I57bbf55c7aba1c86ec8687d2431a50b37e63c6d0

Chiachang Wang   commited 2022-02-09 15:50:06 +08:00
f890874970
Merge "Add and implement API for VpnManagers to request validation" am: 4b66d4e244 am: 1fdf2c9664
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1962981

Change-Id: I3874eb63a706c405232b10862d3bb14bbd2f89f9

Jean Chalard   authored and   Automerger Merge Worker   commited 2022-02-09 06:57:06 +00:00
d87a98b851
Mark NetworkAgentConfig fit for inclusion in stable AIDL
Test: m together with its topic
Change-Id: I897a2081fb48a614f28d9ec3965f99cca9f8ec62

Chalard Jean   commited 2022-02-09 15:19:38 +09:00
3068ce7378
Merge "Add and implement API for VpnManagers to request validation"
Jean Chalard   authored and   Gerrit Code Review   commited 2022-02-09 06:03:45 +00:00
4b66d4e244
Add @SupressLint to get around incorrect warning.
EthernetNetworkSpecifier is being moved from being @SystemApi to public.
This is causing the linter to incorrectly throw errors when building on
erro prone. Add @SupressLint to the method causing the errors prevents
the incorrect warning from causing build failures.

Tracking bug b/193460475 - TODO to remove once fixed.

Ignore-AOSP-First: merge conflict resolutions

Bug: 210485380
Test: build errorprone
Change-Id: Id297e739a2288ccc232c6b989ec7fee41837a910

James Mattis   commited 2022-02-08 20:05:19 -08:00
13f5d37e48
Have connectivity targets be visible to Frameworks[Vcn|Ike]Tests
(cherry picked from commit 7174ac3d86)
Bug: 204153604
Ignore-AOSP-First: part of large topic that only builds internally
Test: build, FrameworksVcnTests, FrameworksIkeTests
Change-Id: I40740200fe4a7476a21bb5330429a11c97e38fb8
Merged-In: I40740200fe4a7476a21bb5330429a11c97e38fb8

Aaron Huang   commited 2022-02-08 14:31:27 +00:00
720ad7c026
Add and implement API for VpnManagers to request validation
This adds a new API that lets VPN apps using VpnManager request
that the platform run its basic validation check on the resulting
network.

Bug: 184750836
Test: atest FrameworksNetTests
Change-Id: I00092eee857d3e33529b19461cfd5dd060a0fe20

Chiachang Wang   authored and   Chalard Jean   commited 2022-02-08 22:47:26 +09:00
865511a8c4
Merge "Address API review comments for DhcpOption object" am: 446c376434 am: 36b048973c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1962359

Change-Id: I3190afdf753cf16060632e4dece6fcd87bd5af6b

Mingguang Xu   authored and   Automerger Merge Worker   commited 2022-02-08 08:10:50 +00:00
738ae3bf6e
Merge "Address API review comments for DhcpOption object"
Mingguang Xu   authored and   Gerrit Code Review   commited 2022-02-08 07:30:45 +00:00
446c376434
Address API review comments for DhcpOption object
Add a link to javadoc for the allowed types and use the lint annotation
to suppress compilation errors instead of modifying the baseline file.

Bug: 213240318

Test: atest FrameworksNetTests
Test: atest NetworkStackTests

Signed-off-by: Mingguang Xu <mingguangxu@google.com>
Change-Id: I2a83cc19baa25068326517b30a9afdea19536af9

Mingguang Xu   commited 2022-02-07 19:42:40 -08:00
6914a16c95
Expose public APIs for IP & static IP configuration am: 1e86b3af26 am: e321fb99a7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1919438

Change-Id: I2bb8446bc3752edd790e9ffd311f6683380e750e

Etan Cohen   authored and   Automerger Merge Worker   commited 2022-02-08 01:08:08 +00:00
9128a05c70
Expose public APIs for IP & static IP configuration
Create public API for IP and static IP configuration.

Bug: 209840828
Test: atest android.net.cts.IpConfigurationTest
Test: atest android.net.cts.StaticIpConfigurationTest
Test: atest android.net.dhcp.DhcpResultsParcelableUtilTest
Change-Id: I720f168d1023806970919ca5dd44239a276826b6

Etan Cohen   commited 2022-02-07 19:57:07 +00:00
1e86b3af26
[MS54.3] Move NetworkStats to updatable sources
This CL builds NetworkStats related codes with the
connectivity module instead of platform.

Ignore-AOSP-First: Avoiding conflicts; cherry-pick will follow
Test: TH
Bug: 197717846
Change-Id: I4eeb7ea9cfc3139991caf0fc22474e0052a0391c

Junyu Lai   authored and   Remi NGUYEN VAN   commited 2022-02-07 10:11:40 +09:00
2ef865e0fd
Add visibility for core tests
Allow core tests to use hidden connectivity APIs. Benchmark tests in
particular cannot be run without these.

Ignore-AOSP-First: Avoiding merge conflicts, cherry-pick will follow
Bug: 197717846
Test: m
Change-Id: Ia01f24317d14b063f9a7e24c3ada11b140641c50

Remi NGUYEN VAN   commited 2022-02-07 10:11:40 +09:00
bdaa351e8a
Merge "Fix documentation link" am: 1513c9991e am: 42e0878dd6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1949517

Change-Id: Ic1036c7eae5e8e5719757188f5523da1c20d5afb

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-02-04 06:29:46 +00:00
c6552c9c37
Merge "Fix documentation link"
Treehugger Robot   authored and   Gerrit Code Review   commited 2022-02-04 06:01:13 +00:00
1513c9991e
Merge changes from topic "low-power-standby-impl" am: 3b20dfbcb7 am: c1ce10a64e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1963391

Change-Id: Ibdbf2ad496bc07d7c36229e3680da3a96632f3f5

Robert Horvath   authored and   Automerger Merge Worker   commited 2022-02-03 16:37:38 +00:00
7fabc66bb1
Have connectivity targets be visible to Frameworks[Vcn|Ike]Tests
Bug: 204153604
Ignore-AOSP-First: part of large topic that only builds internally
Test: build, FrameworksVcnTests, FrameworksIkeTests
Change-Id: I40740200fe4a7476a21bb5330429a11c97e38fb8

Aaron Huang   authored and   Lorenzo Colitti   commited 2022-02-02 23:53:43 +00:00
7174ac3d86
Add Low Power Standby support to TrafficController
Bug: 190822356
Test: atest TrafficControllerTest
Change-Id: I84a95081ab6e6a86543fe2cddf0efdab16c90d72

Robert Horvath   commited 2022-02-02 22:54:21 +01:00
d945bf0b4f
Merge "[MS55.2] Move NetworkStateSnapshot into module folder"
Remi NGUYEN VAN   authored and   Android (Google) Code Review   commited 2022-02-02 13:19:26 +00:00
92a7342d3f
Merge changes from topic "low-power-standby-connectivity"
* changes:
  Define BLOCKED_REASON_LOW_POWER_STANDBY
  Define FIREWALL_CHAIN_LOW_POWER_STANDBY

Robert Horvath   authored and   Gerrit Code Review   commited 2022-02-02 11:23:59 +00:00
c22652401d
[MS55.2] Move NetworkStateSnapshot into module folder
framework-connectivity need to see the aidl files when
compiling IConnectivityManager.aidl, and it can only
include the files by specifying aidl include_dirs.
Thus, move the file into the module since the one outside
of the module is going to be deleted soon.

Ignore-AOSP-First: Avoiding conflicts; cherry-pick will follow
Test: TH
Bug: 197717846
Change-Id: Ide7431d0c98aebd389bee86d13ff44f5ef8b8283

Junyu Lai   authored and   Remi NGUYEN VAN   commited 2022-02-02 16:42:54 +09:00
8d323309ae
Use packBitList to prevent long-related mistakes
In the following expression
  1L << CONSTANT
it is easy to forget the L, especially where it has
not been necessary historically. This has happened
in capabilities where they exceeded 30, see
aosp/1928394. Use the new packBitList to avoid
repeats of the same mistake.

Test: FrameworksNetTests
Change-Id: Ic6a1aa9254bf9ad222c3e2fe4f52bb89a1f9c4e5

Chalard Jean   commited 2022-02-02 13:52:26 +09:00
5fd3cfa342
Define BLOCKED_REASON_LOW_POWER_STANDBY
Bug: 190822356
Test: atest NetworkPolicyManagerServiceTest
Change-Id: I72c81ba1c3791e40a2d311cc3a06bf3b5d3727d1

Robert Horvath   commited 2022-02-01 16:04:35 +01:00
2dac94841a
Define FIREWALL_CHAIN_LOW_POWER_STANDBY
Bug: 190822356
Test: atest NetworkManagementServiceTest
Change-Id: I970eea0e1952f8074cc5c998bbd2ee1ff5a3dc92

Robert Horvath   commited 2022-02-01 16:04:35 +01:00
34cba14425
Rename NetworkUsageStatsTest and move to networking CTS tests.
NetworkUsageStatsTest is the CTS test for the NetworkStatsManager
public APIs. Rename it to NetworkStatsManagerTest, since that is
a better name for it.

Also move it to the networking CTS tests, where it will run on
presubmit on every supported Android version (S, T), and can
access hidden networking APIs. This is important because
NetworkStatsManager is being mainlined in T.

Bug: 204830222
Test: atest CtsNetTestCases:NetworkStatsManagerTest
Change-Id: Ie0fd267aa8bf94594fcc939a8493bef8ab14d3fe

Lorenzo Colitti   commited 2022-02-01 11:24:39 +00:00
eb8d8554bb
Reorganize connectivity framework dependencies
Allow framework-connectivity to depend on framework-connectivity-t
stubs, and framework-connectivity-t to depend on prebuilt (to avoid
circular dependencies) framework-connectivity stubs to compile its own
stubs, and framework-connectivity.impl to compile its implementation.

Also reorganize jarjar rules so that service and framework jar can use
static libraries in framework-connectivity without packaging their own,
reducing duplicate code.

Bug: 204830222
Test: m
Change-Id: I75c34986e7c479de23cdb2e9b360fa1fede018c9

Remi NGUYEN VAN   commited 2022-02-01 13:33:48 +09:00
6a20eeda42