summaryrefslogtreecommitdiff
path: root/tests/net/java
AgeCommit message (Collapse)Author
2021-06-17Merge SP1A.210604.001Brian Orr
Change-Id: I5200ee05285ae422d5e9c1c00f45709a5d6188be
2021-05-21Merge SP1A.210513.004Chris Gross
Change-Id: Ic23aece12c3bbd2b4dcf3205fdbcdd1601deabec
2021-05-13Merge SP1A.210510.001Brian Orr
Change-Id: Ia86f3e18206beabe334e3081cedbaf5b3274f78e
2021-05-13Move net unit tests to packages/ConnectivityRemi NGUYEN VAN
Move the tests together with packages/Connectivity code, so both can be moved to packages/modules/Connectivity together. Also reorganize unit tests in a unit/ directory, as other tests (integration/, common/ etc.) have been added in tests/net since they were created. This makes the directory structure consistent. Test: atest FrameworksNetTests Bug: 187814163 Ignore-AOSP-First: needs per-branch move for merge conflicts Change-Id: I254ffd1c08ec058d594b4ea55cbae5505f8497cc
2021-05-13Merge "Add testVpnTypesEqual to verify consistency" am: 785dc4871c am: ↵Ken Chen
3ae939569e am: 233682e675 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1705385 Change-Id: I53d58c5b2277ba2d88a848ed3e6d6269b4b886b3
2021-05-13Merge "Switch from networkCreate[Physical/Vpn] to networkCreate" am: ↵Ken Chen
c9d5cd9fbc am: 62258932ff am: a4d53bfa6d Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669648 Change-Id: I3475e674c3914c4c61fd0a4246c9ee3e7e02c4fb
2021-05-13Merge "Add testVpnTypesEqual to verify consistency"Ken Chen
2021-05-13Merge "Switch from networkCreate[Physical/Vpn] to networkCreate"Ken Chen
2021-05-12Merge changes from topic "transportinfo-explicit-redaction" into sc-devLorenzo Colitti
* changes: Immediately redact VcnTransportInfo. Do not automatically redact TransportInfo objects.
2021-05-12Merge "Update PrivateDnsMode from StringDef to IntDef"Lucas Lin
2021-05-12Merge "Add MATCH_ANY_USER flag to PackageInfo queries" am: 68301eb7cb am: ↵Paul Hu
2b0351ce1e am: 168172c2c0 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1689207 Change-Id: Ie3dd72aa4b8166198884f348f59c77befc229dc0
2021-05-12Add testVpnTypesEqual to verify consistencyKen Chen
VPN types are defined in both VpnManager.java and NativeVpnType.aidl. The definitions on both sides should match (except TYPE_VPN_NONE). VpnManager.java: TYPE_VPN_NONE = -1 TYPE_VPN_SERVICE = 1 TYPE_VPN_PLATFORM = 2 TYPE_VPN_LEGACY = 3 TYPE_VPN_OEM = 4 NativeVpnType.aidl: SERVICE = 1 PLATFORM = 2 LEGACY = 3 OEM = 4 Bug: N/A Test: atest android.net.VpnManagerTest#testVpnTypesEqual Change-Id: Ie618e227d861100c5318da696140e486af1093a0
2021-05-12Merge "Add MATCH_ANY_USER flag to PackageInfo queries"Paul Hu
2021-05-11Do not automatically redact TransportInfo objects.Lorenzo Colitti
Currently, NetworkCapabilities always redacts the TransportInfo objects it contains whenever a defensive copy is made. This makes it impossible to make a defensive copy on a TransportInfo parcelled from another process without redacting it. Stop redacting by default; instead rely on ConnectivityService explicitly calling NetworkCapabilities' redacting constructor when it returns a NetworkCapabilities object to an app via a callback or synchronous call. This is currently done by - createWithLocationInfoSanitizedIfNecessaryWhenParceled, which is called from callCallbackForRequest, getNetworkCapabilities, and getDefaultNetworkCapabilitiesForUser. - getNetworkCapabilitiesWithoutUids, which is used when sending ConnectivityDiagnosticsManager callbacks. In this method, unconditionally redact all information, which is what the code did previously due to the default redaction setting for empty NetworkCapabilities objects being REDACT_ALL. Bug: 183938194 Test: atest NetworkCapabilitiesTest Test: atest FrameworksNetTests CtsNetTestCases HostsideVpnTests Change-Id: I3108ee94cb0930958e071ba678c3554525b0db82
2021-05-11Switch from networkCreate[Physical/Vpn] to networkCreateKen Chen
networkCreatePhysical and networkCreateVpn are non-extensible. In order to pass OEM requested VPN type to Netd, we need to migrate to networkCreate API. Modify test code accordingly since networkCreatePhysical and networkCreateVpn have been deprecated on Netd. Bug: 171872481 Test: atest FrameworksNetTests atest atest HostsideVpnTests Change-Id: I50ab8615346c49559c16e815482e7804a1e765c8
2021-05-11Merge changes from topic "vcn-fwd" am: d7d2d2a15b am: f980436b32 am: 600401154aBenedict Wong
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682047 Change-Id: I745687f69366657dc33bfdacd878e06affd6a8ec
2021-05-07Add internal support for IPsec forward policiesBenedict Wong
This change adds support for IPsec forward policies, which are necessary for packets to be allowed to be forwarded to another interface, as is the case with tethering. This is necessary and useful only within the system server, and as such is not exposed as a public API. This change is safe, since the addition of a FWD policy on IPsec tunnel interfaces will by default block forwarded traffic (as would be the case without this patch). In the event that the (system) owner of the tunnel requires support for forwarded packets (eg tethering), this patch allows application of transforms in the FWD direction as well. This will be used to ensure that the VCN can be used as the underlying network for the purposes of tethering. Bug: 185495453 Test: atest IpSecServiceTest Test: atest IpSecServiceParameterizedTest Test: manual testing with tethering over VCN Change-Id: I74ecea71f1954029f6fbdbe34598c82e0aac386b
2021-05-05Update PrivateDnsMode from StringDef to IntDeflucaslin
Update PrivateDnsMode from StringDef to IntDef because IntDef is the normal way of representing multiple choices in public API. Also update other related files. Bug: 185311744 Test: 1. make update-api 2. atest FrameworksNetTests CtsNetTestCases CtsNetTestCasesLatestSdk 3. atest FrameworksServicesTests:DevicePolicyManagerTest Change-Id: I23e7ec140066979726d769cabc5f7057bb2167e6 Merged-In: I23e7ec140066979726d769cabc5f7057bb2167e6 (Cherry-picked from ag/14227609)
2021-04-29Merge SP1A.210425.001Scott Lobdell
Change-Id: I8d45e47c131320cac5e794fd629fdef84dd3bcfc
2021-04-29Merge "Add getters to NetworkStateSnapshot"Treehugger Robot
2021-04-29Merge "Add getters to UnderlyingNetworkInfo"Treehugger Robot
2021-04-29Merge "Rename getAllNetworkStateSnapshot which should be pluralized"Treehugger Robot
2021-04-28Rename *Iface* APIs to *Interface*Aaron Huang
Address API review feedback, other APIs have been refering to these as "interface" instead of "iface" so migrate the APIs named *Iface* to *Interface*. Bug: 183972554 Test: atest android.net.UnderlyingNetworkInfoTest Change-Id: I38b476e762fb57fa88c4a789092d0af6f5330d80
2021-04-27Merge "Update PrivateDnsMode from StringDef to IntDef" into sc-devLucas Lin
2021-04-27Merge "wifi data usage: support to get carrier merged wifi network." am: ↵Les Lee
bef2f5be94 am: debea981d9 am: 638b67a58f Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1538743 Change-Id: Ie55770f885bf3c917ad485d2bd8c025b676f12b6
2021-04-27Merge "wifi data usage: support to get carrier merged wifi network."Les Lee
2021-04-26Merge "Changing per-app default request to TRACK_DEFAULT"James Mattis
2021-04-26Add MATCH_ANY_USER flag to PackageInfo queriespaulhu
- Querying PackageInfo should have MATCH_ANY_USER flag because some apps are only installed for specific users. If no flag, it will get NameNotFoundException. - Also add missed break on switch case. Bug: 186382373 Test: atests FrameworksNetTests Change-Id: I37c8c42352a9a84ccbe9a37248febcd62b8f59e4
2021-04-26Merge "Address API review feedback"Chiachang Wang
2021-04-23Merge SP1A.210412.001Scott Lobdell
Change-Id: I0e1c2f5679d5f721cd605b7da785959763311698
2021-04-23Changing per-app default request to TRACK_DEFAULTJames Mattis
Changing the per-app default request flows to fallback to a request of type TRACK_DEFAULT as opposed to type REQUEST. The main benefit of this change is that these requests will no longer be sent to the factories which is desired. Bug: 180452284 Bug: 176494815 Test: atest FrameworksNetTests atest FrameworksNetIntegrationTests atest CtsNetTestCasesLatestSdk Change-Id: I312e55a54f70aa82953a32ab9369d5afc02b75e5 Merged-In: I312e55a54f70aa82953a32ab9369d5afc02b75e5
2021-04-23Merge changes I5125755b,I312e55a5 into sc-devJames Mattis
* changes: Updating tests to honor per-app TRACK_DEFAULT Changing per-app default request to TRACK_DEFAULT
2021-04-23Update PrivateDnsMode from StringDef to IntDeflucaslin
Update PrivateDnsMode from StringDef to IntDef because IntDef is the normal way of representing multiple choices in public API. Also update other related files. Bug: 185311744 Test: 1. make update-api 2. atest FrameworksNetTests CtsNetTestCases CtsNetTestCasesLatestSdk 3. atest FrameworksServicesTests:DevicePolicyManagerTest Change-Id: I23e7ec140066979726d769cabc5f7057bb2167e6
2021-04-23Merge "Use connectivity resources in service-connectivity"Remi NGUYEN VAN
2021-04-23Address API review feedbackChiachang Wang
Address API review feedback to: - Rename NetworkAgent#setTeardownDelayMs to NetworkAgent#setTeardownDelayMillis - Use getters instead of fields in VpnTransportInfo - Rename registerDefaultNetworkCallbackAsUid to registerDefaultNetworkCallbackForUid in ConnectiivityManager Bug: 183972850 Bug: 185246410 Fix: 184735863 Test: make update-api Test: atest FrameworksNetTests Test: atest CtsNetTestCasesLatestSdk Change-Id: I5e8c4bed8bda40d507afa894c359b5e24ee5d868 Merged-In: I5e8c4bed8bda40d507afa894c359b5e24ee5d868
2021-04-23Use connectivity resources in service-connectivityRemi NGUYEN VAN
Migrate resource usage to the connectivity resource package. For framework resources that have known overlays, keep a fallback until the overlays can be migrated. Bug: 182125649 Test: atest FrameworksNetTests Merged-In: I778d94a5aac0c4e20e78b1ba3a002495c17a38a0 (clean cherry-pick) Change-Id: I778d94a5aac0c4e20e78b1ba3a002495c17a38a0
2021-04-22Updating tests to honor per-app TRACK_DEFAULTJames Mattis
Per-app APIs in ConnectivityService will now have their fallback request which tracks the system default be of type TRACK_DEFAULT as opposed to REQUEST. Existing tests which expect this fallback request to be sent to network factories need to be updated to validate this change. Bug: 180452284 Bug: 176494815 Test: atest FrameworksNetTests Change-Id: I5125755b3ed1ec535494e2d7a48c0860710ed056
2021-04-23Merge "Address API review feedback" into sc-devChiachang Wang
2021-04-22Add getters to UnderlyingNetworkInfoAaron Huang
Address API review feedback, add getters to UnderlyingNetworkInfo instead of exposing fields. Instead of wasting memory by converting this into an array, have migrateTun take a List<String>. In turn, tunAdjustmentInit should also take a List<String>. (cherry picked from ag/14211075) Bug: 183972554 Test: atest android.net.UnderlyingNetworkInfoTest Merged-In: Id59744097208d91298a25ef110ade91a9cf291a1 Change-Id: Id59744097208d91298a25ef110ade91a9cf291a1
2021-04-22Changing per-app default request to TRACK_DEFAULTJames Mattis
Changing the per-app default request flows to fallback to a request of type TRACK_DEFAULT as opposed to type REQUEST. The main benefit of this change is that these requests will no longer be sent to the factories which is desired. Bug: 180452284 Bug: 176494815 Test: atest FrameworksNetTests atest FrameworksNetIntegrationTests atest CtsNetTestCasesLatestSdk Change-Id: I312e55a54f70aa82953a32ab9369d5afc02b75e5
2021-04-22Merge "Enable policy ranking" into sc-devChalard Jean
2021-04-22Add getters to NetworkStateSnapshotAaron Huang
Address API council feedback, add getters to NetworkStateSnapshot instead of exposing the bare fields directly. (cherry picked from ag/14233655) Bug: 183972826 Test: FrameworksNetTests Merged-In: Id1707753b42ae88d2b95e4bd00a792609434e4f5 Change-Id: Id1707753b42ae88d2b95e4bd00a792609434e4f5
2021-04-22Rename getAllNetworkStateSnapshot which should be pluralizedAaron Huang
Address API review feedback, ConnectivityManager#getAllNetworkStateSnapshot should be pluralized so rename the method to getAllNetworkStateSnapshots (cherry picked from ag/14221105) Bug: 183972554 Test: make, FrameworksNetTests FrameworksServicesTests Merged-In: Ic18d17d05984fa2466c962c7843c0ef7183ce77c Change-Id: Ic18d17d05984fa2466c962c7843c0ef7183ce77c
2021-04-22Merge "[VCN19] Rename get/setSubIds to get/setSubscriptionIds"Treehugger Robot
2021-04-22Merge "Add getters to UnderlyingNetworkInfo" into sc-devAaron Huang
2021-04-21Merge "Add getters to NetworkStateSnapshot" into sc-devAaron Huang
2021-04-21Enable policy rankingChalard Jean
Test: Passes all presubmits, been tested in labs Bug: 184834350 Change-Id: If33884aa245bcc8817bbc9c2fdfab035249e7301
2021-04-21Merge "Correctly count nri uid request counts" am: 1b7a5e282c am: 0c8d65b489 ↵James Mattis
am: 8bc9d3464c Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1655051 Change-Id: Ibec1f37f2062827cf390eb344dd30447bdabec13
2021-04-21Merge "Correctly count nri uid request counts"James Mattis
2021-04-20Merge "Refactoring and mocking to make sure unit test doesn't call the real ↵Nazanin Bakhshi
service" am: 68bf2c52e5 am: 96b0148cc4 am: bc401f523d Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1668228 Change-Id: I92c9fc5f4dcfc0a7f80db78b885945a1021eab20
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-03 16:16:50 +0000