Commit graph android_packages_modules_Co.../framework
Message SHA1
Remove workaround to remove FlaggedAPI in ump
Test: TH
Merged-In: Ib69d2fdc1d73b36a08a3d8ae1f2c45b2bcffae64
Change-Id: I88c993680976d2e10d672bfdbf45119f2db13868

Motomu Utsumi   commited 2023-11-29 11:58:10 +09:00
da8fac1edb
Merge "Remove --show-annotation FlaggedApi from flagged-apis-droidstubs" into main am: d3d41ac7a4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2842795

Change-Id: I3ca4028fcc283f17b81c132416fd0a51360e7b0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Motomu Utsumi   authored and   Automerger Merge Worker   commited 2023-11-22 14:35:59 +00:00
ca7d626641
Merge "Remove --show-annotation FlaggedApi from flagged-apis-droidstubs" into main
Motomu Utsumi   authored and   Gerrit Code Review   commited 2023-11-22 14:22:04 +00:00
d3d41ac7a4
Remove --show-annotation FlaggedApi from flagged-apis-droidstubs
framework-connectivity-flagged-apis-droidstubs is used by
jarjar-rules-generator to avoid jarjaring flagged apis.
But, this usage of --show-annotation FlaggedApi in the flag is not
supported.
So this CL removes --show-annotation FlaggedApi.
As far as framework-connectivity-flagged-apis-droidstubs contains
flagged APIs, it's fine that this droidstubs also contains non-flagged
APIs.

Test: TH
Bug: 312408311
Change-Id: I2f1f5624d98873420c0c36ac6e31386102211045

Motomu Utsumi   commited 2023-11-22 19:05:48 +09:00
ba5dde84f1
Merge "Explicitly select mdns_aidl_interface-V1-java" into main am: e5c9138ead
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2836113

Change-Id: I8f52a0875064a3f00f1912a0869ae3fef148ee78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Ken Chen   authored and   Automerger Merge Worker   commited 2023-11-21 09:29:35 +00:00
8d96e4f538
Merge "Explicitly select mdns_aidl_interface-V1-java" into main
Ken Chen   authored and   Gerrit Code Review   commited 2023-11-21 09:02:35 +00:00
e5c9138ead
Explicitly select mdns_aidl_interface-V1-java
The only version of mdns_aidl_interface supported by Netd is V1. After
that, the entire interface has been deprecated (which is the V2). The
latest stable version is no longer meaningful because no one is supposed
to use V2.

Bug: 298594687
Test: m
Change-Id: I9ac8199312cdc5d829889ea562979cad7d3bf054

Ken Chen   commited 2023-11-21 01:58:13 +00:00
7da858ca1a
Merge "Add more powerful CTS for allowedUids" into main am: 51c80a72d8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2405720

Change-Id: I4a95ac511b1bf7329e281452bb817f0c891d7931
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Jean Chalard   authored and   Automerger Merge Worker   commited 2023-11-20 05:17:27 +00:00
bd402334a8
Merge "Add more powerful CTS for allowedUids" into main
Jean Chalard   authored and   Gerrit Code Review   commited 2023-11-20 04:44:22 +00:00
51c80a72d8
Add more powerful CTS for allowedUids
This tests that the network providers are subject to appropriate
limitations as to what they can set as allowedUids – both in the
positive (can do) case, and the negative (can't do) case.

Test: this
Change-Id: I115e2a4bc02ddcd03ecf2f35130fcb0378da22bd

Chalard Jean   commited 2023-11-20 12:16:39 +09:00
5301778ad8
Merge "Fix FlaggedAPI droidstubs to includes non flagged SystemApi" into main am: 110d5f54fc
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2824094

Change-Id: Ic62c00fbc61a2c6038937a2b74a6b20461a1678d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Motomu Utsumi   authored and   Automerger Merge Worker   commited 2023-11-17 02:39:39 +00:00
35891ec63e
Merge "Fix FlaggedAPI droidstubs to includes non flagged SystemApi" into main
Motomu Utsumi   authored and   Gerrit Code Review   commited 2023-11-17 02:03:12 +00:00
110d5f54fc
Merge "[BR11] Read data saver status from bpf" into main am: d3447a1d52
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2829355

Change-Id: I29a94441f7d891ebe2b0a45c003c6c5ac7f00392
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Junyu Lai   authored and   Automerger Merge Worker   commited 2023-11-16 03:22:56 +00:00
8b30404479
Merge "[BR11] Read data saver status from bpf" into main
Junyu Lai   authored and   Gerrit Code Review   commited 2023-11-16 02:57:55 +00:00
d3447a1d52
[BR11] Read data saver status from bpf
Writing data saver status to bpf is supported on Android V or
later devices. Thus, read that from bpf if available.

Test: atest FrameworksNetTests:android.net.connectivity.android.net.BpfNetMapsReaderTest
Test: atest ConnectivityCoverageTests:android.net.connectivity.android.net.ConnectivityManagerTest
Fix: 310801259
Change-Id: Ibd2616328d83f72ee6d2665239c3a44379d1ebf5

Junyu Lai   commited 2023-11-15 12:26:40 +08:00
9e88052fe7
Merge "Fix typedef retention" into main am: 4de53e2d18
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2824774

Change-Id: I1c3c987f70bac700dde531c5b8e130357cb599d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Anton Hansson   authored and   Automerger Merge Worker   commited 2023-11-13 10:11:00 +00:00
e4a6fd5bf7
Fix typedef retention
Typedef annotations are meant to have SOURCE retention, as they're
only analyzed by metalava to produce a separate file that's actually
consumed by the tools. Update typedefs as such.

Bug: 309971481
Test: m checkapi
Change-Id: Ic603db350af0825c87f4d99cff2ca4f4b7e57215

Anton Hansson   commited 2023-11-10 13:28:07 +00:00
f5fa3c6c72
Add equals, hashCode to MulticastRoutingConfig am: d25444ffce
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2801433

Change-Id: Idadb7ea191e032e8d64f0a5b3b05ebd9997fcb42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Yang Sun   authored and   Automerger Merge Worker   commited 2023-11-10 11:17:56 +00:00
49249f365e
Add equals, hashCode to MulticastRoutingConfig
Add helper functions to help compare if MulticastRoutingConfig
has changed.

Test: atest MulticastRoutingConfigTest
Change-Id: I30ed4796efbaafbcf1a273c12a9231ec02bc36f0

Yang Sun   commited 2023-11-10 13:06:22 +08:00
d25444ffce
Merge "Prepare exposing LocalNetworkConfig and its satellites" into main am: 8a5055a3e9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2778489

Change-Id: Ic8200edab8a9c376f78fbbafb8c4a62195ca0428
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Jean Chalard   authored and   Automerger Merge Worker   commited 2023-11-10 03:35:09 +00:00
8a7868bc5a
Merge "Prepare exposing LocalNetworkConfig and its satellites" into main
Jean Chalard   authored and   Gerrit Code Review   commited 2023-11-10 03:08:07 +00:00
8a5055a3e9
Merge "Add overriding method of a default method to signature files" into main am: be43ef41bc
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2824410

Change-Id: I86b0b3df54f7dd392ede6fc539f594ffd055aa99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Jihoon Kang   authored and   Automerger Merge Worker   commited 2023-11-09 17:39:31 +00:00
563a7383bf
Merge "Add overriding method of a default method to signature files" into main
Jihoon Kang   authored and   Gerrit Code Review   commited 2023-11-09 17:00:53 +00:00
be43ef41bc
Merge "Baseline issues that were previously suppressed" into main am: 879946d1c9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2818860

Change-Id: Ib7407a4368acaa2906b101225c64cb70cd87bd06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Anton Hansson   authored and   Automerger Merge Worker   commited 2023-11-09 10:26:52 +00:00
93ea8465b5
Merge "Baseline issues that were previously suppressed" into main
Anton Hansson   authored and   Gerrit Code Review   commited 2023-11-09 10:03:23 +00:00
879946d1c9
Add overriding method of a default method to signature files
Currently, the signature file elides overrides of a default method,
as they are not essential for the compilation of the stubs.
However, in some scenarios, the overrides of a default method may be
essential for the compilation of the reverse dependency of the stubs.
In the scenario seen below:
```
// API
interface ApiInterface {
    public default void bar() {};
}
class ApiClass implements AnotherParentInterface{
    public void bar() {}
}

// App depending on the API
interface AppInterface {
    public void bar();
}
public class AppClass extends ApiClass implements AppInterface {
}
```
Removal of `ApiClass.bar()` will lead to not overriding an abstract method
`AppInterface.bar()` compilation error in `AppClass`.
Therefore, this change adds the overrides of a default method to the
signature files.

Test: checkapi
Bug: 299366704
Change-Id: Ie11dbeafc39efec06f605e306c92155e834a6685

Jihoon Kang   commited 2023-11-09 09:40:27 +00:00
9c5c9b0a94
Fix FlaggedAPI droidstubs to includes non flagged SystemApi
FlaggedAPI annotated SystemAPI/ModuleAPI should be able to reference
the SystemAPI/ModuleAPI without FlaggedAPI annotation.
framework-connectivity-flagged-apis-droidstubs was failing to build in
this case. This CL fixes this issue.

After this CL, flagged apis droidstubs build even if the
FlaggedAPI annotated SystemAPI references the public API.
But this is caught by other targets and this should not be the issue.

Test: m framework-connectivity-flagged-apis-droidstubs
Change-Id: I0e0b5213c8e9b757e1b25c2a40b15b2c820ddd59

Motomu Utsumi   commited 2023-11-09 17:45:52 +09:00
2f2aa21419
Prepare exposing LocalNetworkConfig and its satellites
This doesn't actually expose the classes but prepares the
files for everything the linter says about it and the
API guidelines, as well as add documentation.

Test: CSLocalAgentsTest
Change-Id: I38c699d627eb91f19ab1628992ae0afde4673e89

Chalard Jean   commited 2023-11-09 14:26:13 +09:00
bb2557aa3a
Merge "Add test to make sure that unwanted local nets disconnect correctly" into main am: 7cf6e5a3b0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2793352

Change-Id: I7fbd9a87505710c3d6c784087faa19343fb60837
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Jean Chalard   authored and   Automerger Merge Worker   commited 2023-11-09 02:37:35 +00:00
ee97d31f68
Merge "Add test to make sure that unwanted local nets disconnect correctly" into main
Jean Chalard   authored and   Gerrit Code Review   commited 2023-11-09 02:08:36 +00:00
7cf6e5a3b0
Merge "New firewall chain for default background restrictions" into main am: 6bca8c1df8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2818818

Change-Id: I38579c52fedcbfd11e20bf051a2890ac8ce2e52b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Suprabh Shukla   authored and   Automerger Merge Worker   commited 2023-11-08 14:29:56 +00:00
22116cc206
New firewall chain for default background restrictions
A new firewall chain is needed to configure background network
restrictions for apps.
This change only adds the API stubs and traffic controller constants to
make the chain work. Policy changes using this chain will follow in
the framework code.

Test: atest CtsNetTestCases:ConnectivityManagerTest
Test: atest ConnectivityServiceTest

NO_IFTTT=The Lint rule along with the relevant code in Common.h is
being deleted in aosp/2819759

Bug: 304347838
Change-Id: I33e2db6671431f7c576fc931d9f96e684fc1e78a

Suprabh Shukla   commited 2023-11-08 10:17:30 +00:00
2d893b68a9
Merge "Remove unused enums for firewall in Common.h" into main am: bc4af4e1d0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2819759

Change-Id: I935509ac1368265b125a70615170a59c2da9f569
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Maciej Ĺ»enczykowski   authored and   Automerger Merge Worker   commited 2023-11-08 09:35:02 +00:00
68ee76844c
Remove unused enums for firewall in Common.h
They are used by TrafficController which was removed by aosp/2817123

Bug: 217624062
Test: TH
Change-Id: I561f135b43e7d15e6f45e95b502fc3c90c4b3ddf

Motomu Utsumi   commited 2023-11-08 14:44:17 +09:00
b51381e0e1
Merge changes I301bf032,I8caca97b into main am: e28740f79b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2801573

Change-Id: I5e87f8eac13af3e213ccfbeae9c89fd93e80f92d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Jean Chalard   authored and   Automerger Merge Worker   commited 2023-11-07 14:01:09 +00:00
04523693b2
Merge changes I301bf032,I8caca97b into main
* changes:
  Rename TiramisuConnectivityInternalApiUtil
  Add LocalNetworkInfo and send callbacks when it changes

Jean Chalard   authored and   Gerrit Code Review   commited 2023-11-07 13:29:00 +00:00
e28740f79b
Add test to make sure that unwanted local nets disconnect correctly
Also add some toString() methods that were useful in debugging.

Test: new test in CSLocalAgentTests
Change-Id: Ife95815e39d92bbef84b1c5ea75a151882590d09

Chalard Jean   commited 2023-11-07 22:28:25 +09:00
4fe2339f2c
Merge "Reapply "Ignore @FlaggedApi annotated API in udc mainline branch"" into udc-mainline-prod
Motomu Utsumi   authored and   Android (Google) Code Review   commited 2023-11-07 11:09:05 +00:00
bb46026a2a
Baseline issues that were previously suppressed
java_sdk_library has previously internally disabled a few legitimate
issues. As this is being un-done for modules, add baselines for the
pre-existing issues.

Bug: 306806877
Test: m checkapi
Merged-In: Ie764d33196675e1482f30ecfd3d6d22b7fa25c27
Change-Id: Ie764d33196675e1482f30ecfd3d6d22b7fa25c27

Anton Hansson   commited 2023-11-07 08:40:36 +00:00
d8e40b3204
Rename TiramisuConnectivityInternalApiUtil
This can be used from S. There is no point in having a
release name in the name of this class.

Test: builds
Change-Id: I301bf032f856dd4c30554e06013f31ee57208c4e

Chalard Jean   commited 2023-11-07 17:29:39 +09:00
674f34702c
Add LocalNetworkInfo and send callbacks when it changes
Test: CSLocalAgentTest
Change-Id: I8caca97b891081f9212a01d428a34ed1a08d5126

Chalard Jean   commited 2023-11-07 17:29:38 +09:00
22350c93b4
Merge "Make FlaggedAPI available to CtsThreadNetworkTestCases" into main
Motomu Utsumi   authored and   Gerrit Code Review   commited 2023-11-07 07:29:13 +00:00
f652d2ca82
Merge "Remove the OffloadServiceInfo from jarjar exclusion" into main
Treehugger Robot   authored and   Gerrit Code Review   commited 2023-11-07 03:27:41 +00:00
6795186c00
Make FlaggedAPI available to CtsThreadNetworkTestCases
FlaggedAPI will be ignored in udc-mainline-prod.
This makes CtsThreadNetworkTestCases build fail.
This CL updates CtsThreadNetworkTestCases to build against FlaggedAPI
and also updates framework-connectivity-jarjar-rules not to jarjar
FlaggedAPI.

Test: TH
Test: m CtsThreadNetworkTestCases
Change-Id: Ida8872b3bf61b7a59733f5fcec9e7d250efd3e58

Motomu Utsumi   commited 2023-11-07 12:21:45 +09:00
ada9e9877c
Reapply "Ignore @FlaggedApi annotated API in udc mainline branch"
This change was reverted by ag/24727594.

Test: m checkapi
Merged-In: Ib69d2fdc1d73b36a08a3d8ae1f2c45b2bcffae64
Change-Id: If9d1f378187eca0fda9f5ddf23653704764f0707

Motomu Utsumi   commited 2023-11-07 10:21:29 +09:00
ccfadb3fb5
Merge "Add methods for updating ingressDiscardRule bpf map to BpfNetMaps" into main
Motomu Utsumi   authored and   Gerrit Code Review   commited 2023-11-06 10:41:53 +00:00
d872c3c960
Remove the OffloadServiceInfo from jarjar exclusion
The OffloadServiceInfo is already became API. It is not necessary to
keep it in jarjar exclusion anymore.

Test: TH
Change-Id: I81020553dfab4d7d8c88a67959058a99beb3b803

Yuyang Huang   commited 2023-11-06 17:49:53 +09:00
56cb85e1f5
[BR03.1] Expose isUidNetworkingBlocked
Test: atest CtsHostsideNetworkTests:com.android.cts.net.HostsideNetworkCallbackTests
Bug: 297836825
Change-Id: I70b2351b9cd1c3c6fa34258397e0bf22cb8150b2

Junyu Lai   commited 2023-11-06 13:26:19 +08:00
bb59480733
Add forwarding methods to RoutingCoordinator
Test: RoutingCoordinatorServiceTest
      TetheringTest
Change-Id: I2fa6250875d517c3452c85a3678d3feb0c0354d8

Chalard Jean   commited 2023-11-02 23:25:32 +09:00
820ce9df2d
Rename KEEP_CONNECTED_DOWNSTREAM_NETWORK to K_C_LOCAL_NETWORK
...following feedback

Test: FrameworksNetTests
Change-Id: I9c25f0b066a58980bf071d2b958223ed609f0d8e

Chalard Jean   commited 2023-11-02 23:25:31 +09:00
842a914dff