Commit Graph

9773 Commits

Author SHA1 Message Date
Cody Kesting
a5786a15e1 Merge changes I01ffdde2,Iecab1226
* changes:
  Set NOT_VCN_MANAGED capability for Networks in VcnMgmtSvc.
  Notify policy listeners when VCN subIds change.
2021-05-05 21:27:09 +00:00
Cody Kesting
2225648d47 Notify policy listeners when VCN subIds change.
This CL updates VcnManagementService to notify policy listeners
when the subIds for any VCN instances change. This is necessary to
ensure that NetworkFactories properly update their Networks in the
event that a Network comes up under an existing VCN are properly
marked as VCN-managed.

Bug: 187112989
Test: atest FrameworksVcnTests CtsVcnTestCases
Change-Id: Iecab1226119c8fd876131c381647267f18339db2
2021-05-04 15:57:32 -07:00
Treehugger Robot
5a2abf1341 Merge "Trigger reevaluation of all requests when mobile data state changes" 2021-05-01 01:14:33 +00:00
Benedict Wong
9d8fd5d82a Trigger reevaluation of all requests when mobile data state changes
This change ensures mobile data state changes result in the reevaluation
of all NetworkRequests; ensuring that any requests that can be fulfilled
as a result of the mobile data state change start the relevant
GatewayConnections

Test: atest FrameworksVcnTests
Change-Id: I442ca2ee0fc8b9ad962a2491ddc3818535d9e042
2021-04-30 23:29:20 +00:00
Treehugger Robot
2f83b6a72d Merge "Add getters to NetworkStateSnapshot" 2021-04-29 09:20:34 +00:00
Treehugger Robot
e2e8b9ce88 Merge "Add getters to UnderlyingNetworkInfo" 2021-04-29 07:29:08 +00:00
Treehugger Robot
d1473b36d6 Merge "Rename getAllNetworkStateSnapshot which should be pluralized" 2021-04-29 04:40:51 +00:00
Benedict Wong
c6fe30068d Merge "Update set|getRetryIntervalsMs to Millis" 2021-04-29 04:35:45 +00:00
Benedict Wong
19be41cb30 Merge "Set safe mode alarm when validation reports NOT_VALID" 2021-04-28 01:47:08 +00:00
Benedict Wong
913ae2b89b Allow VcnTransportInfo to be parcelled
Allows VCN transport info to be parcelled for purposes of sysUI

Bug: 186025257
Test: atest FrameworksVcnTests
Change-Id: I5a5d9b88659c8dcaa9ded16d491b2bac0529169a
2021-04-27 17:35:44 -07:00
Benedict Wong
e7f06d9eb9 Update set|getRetryIntervalsMs to Millis
Bug: 184612525
Test: atest FrameworksVcnTests
Change-Id: I696854960ca9488ae2c8a0c569c57a8563998ac8
2021-04-27 22:28:43 +00:00
Benedict Wong
44629199de Set safe mode alarm when validation reports NOT_VALID
Bug: 186257328
Test: atest FrameworksVcnTests
Change-Id: I80f37d42e4d61026b3521a4133257cd472c22f1a
2021-04-27 22:20:15 +00:00
Yan Yan
b8f67d1bd7 Merge "Remove TunnelConnectionParams interface" 2021-04-27 18:34:08 +00:00
Les Lee
bef2f5be94 Merge "wifi data usage: support to get carrier merged wifi network." 2021-04-27 02:13:32 +00:00
Bob Badour
6b3ffd27ab [LSC] Add LOCAL_LICENSE_KINDS to frameworks/base
Added SPDX-license-identifier-Apache-2.0 to:
  location/tests/Android.bp
  services/tests/servicestests/test-apps/PackageParsingTestManifests/Android.bp
  tests/DynamicCodeLoggerIntegrationTests/Android.mk
  tests/FlickerTests/test-apps/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: If81cb09cb5da063fe7cc00a70d46ce6d4ce5b10e
2021-04-26 12:42:45 -07:00
Yan Yan
de7222cba5 Remove TunnelConnectionParams interface
To avoid exposing empty interface.

Test: atest FrameworksVcnTests
Bug: 180664474
Change-Id: Ia33e75b77f1563a1c3d31e0145b7ec2be728b6db
2021-04-26 10:47:05 -07:00
James Mattis
bc4ca04caa Merge "Changing per-app default request to TRACK_DEFAULT" 2021-04-26 14:39:44 +00:00
Chiachang Wang
13e89b75d3 Merge "Address API review feedback" 2021-04-26 00:22:27 +00:00
Bob Badour
6a66a0714c [LSC] Add LOCAL_LICENSE_KINDS to frameworks/base
Added SPDX-license-identifier-Apache-2.0 to:
  location/tests/Android.bp
  services/tests/servicestests/test-apps/PackageParsingTestManifests/Android.bp
  tests/FlickerTests/test-apps/Android.bp
  tests/backup/Android.mk

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: Ie3a7632b6f46a8a104bfdf52ab77fb7ffefbdd7c
2021-04-23 16:13:27 -07:00
James Mattis
572ab83446 Changing per-app default request to TRACK_DEFAULT
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-23 07:47:11 -07:00
Remi NGUYEN VAN
efcd27a0dc Merge "Use connectivity resources in service-connectivity" 2021-04-23 05:42:13 +00:00
Chiachang Wang
a424d5bafc Address API review feedback
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-23 02:46:05 +00:00
Remi NGUYEN VAN
2ecc79d616 Use connectivity resources in service-connectivity
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-23 10:36:15 +09:00
Remi NGUYEN VAN
89cd3d59c0 Merge "Add QUERY_ALL_PACKAGES to net integration tests" 2021-04-22 14:38:40 +00:00
Aaron Huang
7511be401e Add getters to UnderlyingNetworkInfo
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-22 22:30:42 +08:00
Remi NGUYEN VAN
c78125940a Add QUERY_ALL_PACKAGES to net integration tests
The permission is necessary for ConnectivityService to obtain its
resource package. As the integration tests run ConnectivityService
in-process, they need the permission.

Bug: 186091860
Test: atest FrameworksNetIntegrationTests
Change-Id: I60cf9b54faddf0ea4cb02146c83c9bba58370749
2021-04-22 22:02:01 +09:00
Aaron Huang
a3ae9b1c38 Add getters to NetworkStateSnapshot
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-22 18:21:00 +08:00
Aaron Huang
5fbf0f36b9 Rename getAllNetworkStateSnapshot which should be pluralized
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-22 17:45:22 +08:00
Yan Yan
bc545c8a8a Merge changes from topics "encrypted-tunnel-interface", "iketunnelparams", "vcn-encrypted-tunnel"
* changes:
  Replace VcnControlPlaneConfig with TunnelConnectionParams
  Convert TunnelConnectionParams to/from PersistableBundle
  Create TunnelConnectionParams interface
2021-04-22 08:39:20 +00:00
Yan Yan
4eaa894d84 Replace VcnControlPlaneConfig with TunnelConnectionParams
Use the more generic object TunnelConnectionParams in VCN.
TunnelConnectionParams may also be used in VPN in the future.

Test: atest FrameworksVcnTests
Bug: 180664474
Change-Id: Ie433f9df614e1f51cdff200d915b68b61e5ca35e
2021-04-21 22:52:22 -07:00
Yan Yan
c0b7c4fa5a Convert TunnelConnectionParams to/from PersistableBundle
Add utility class to convert TunnelConnectionParams to and from
PersistableBundle.

Bug: 180664474
Test: atest EncryptedTunnelParamsUtilsTest
Change-Id: I93ae068eb6d1e1c4d3fcbaccbaae867db8d07a38
2021-04-21 22:49:47 -07:00
Treehugger Robot
a2da3ebb16 Merge "[VCN19] Rename get/setSubIds to get/setSubscriptionIds" 2021-04-22 04:43:26 +00:00
Benedict Wong
80afe1eeee Merge changes I64b56575,I40553a7b
* changes:
  Expose API for retrieval of subscription groups with VCN configured
  Add support for retrieval of configured VCNs by carrier privilege
2021-04-22 01:31:11 +00:00
Treehugger Robot
0cfaf8aa1c Merge "DO NOT MERGE Add LOCAL_LICENSE_KINDS to frameworks/base" 2021-04-21 21:58:38 +00:00
Bob Badour
268090cd09 DO NOT MERGE Add LOCAL_LICENSE_KINDS to frameworks/base
Added SPDX-license-identifier-Apache-2.0 to:
  core/tests/hosttests/test-apps/DownloadManagerTestApp/Android.mk
  core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.mk
  core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.mk
  core/tests/hosttests/test-apps/MultiDexLegacyTestAppTests/Android.mk
  core/tests/hosttests/test-apps/MultiDexLegacyTestAppTests2/Android.mk
  core/tests/hosttests/test-apps/MultiDexLegacyTestAppWithCorruptedDex/Android.mk
  core/tests/hosttests/test-apps/MultiDexLegacyTestServices/Android.mk
  core/tests/hosttests/test-apps/MultiDexLegacyTestServicesTests2/Android.mk
  core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/Android.mk
  core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/Android.mk
  core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/Android.mk
  core/tests/overlaytests/host/test-apps/SignatureOverlay/Android.mk
  core/tests/overlaytests/host/test-apps/UpdateOverlay/Android.mk
  location/tests/Android.bp
  packages/CarSystemUI/tests/Android.mk
  packages/SystemUI/tests/Android.mk
  packages/overlays/AccentColorAmethystOverlay/Android.mk
  packages/overlays/AccentColorAquamarineOverlay/Android.mk
  packages/overlays/AccentColorBlackOverlay/Android.mk
  packages/overlays/AccentColorCarbonOverlay/Android.mk
  packages/overlays/AccentColorCinnamonOverlay/Android.mk
  packages/overlays/AccentColorGreenOverlay/Android.mk
  packages/overlays/AccentColorOceanOverlay/Android.mk
  packages/overlays/AccentColorOrchidOverlay/Android.mk
  packages/overlays/AccentColorPaletteOverlay/Android.mk
  packages/overlays/AccentColorPurpleOverlay/Android.mk
  packages/overlays/AccentColorSandOverlay/Android.mk
  packages/overlays/AccentColorSpaceOverlay/Android.mk
  packages/overlays/AccentColorTangerineOverlay/Android.mk
  packages/overlays/DisplayCutoutEmulationCornerOverlay/Android.mk
  packages/overlays/DisplayCutoutEmulationDoubleOverlay/Android.mk
  packages/overlays/DisplayCutoutEmulationHoleOverlay/Android.mk
  packages/overlays/DisplayCutoutEmulationNarrowOverlay/Android.mk
  packages/overlays/DisplayCutoutEmulationTallOverlay/Android.mk
  packages/overlays/DisplayCutoutEmulationWaterfallOverlay/Android.mk
  packages/overlays/DisplayCutoutEmulationWideOverlay/Android.mk
  packages/overlays/FontNotoSerifSourceOverlay/Android.mk
  packages/overlays/IconPackCircularAndroidOverlay/Android.mk
  packages/overlays/IconPackCircularLauncherOverlay/Android.mk
  packages/overlays/IconPackCircularSettingsOverlay/Android.mk
  packages/overlays/IconPackCircularSystemUIOverlay/Android.mk
  packages/overlays/IconPackCircularThemePickerOverlay/Android.mk
  packages/overlays/IconPackFilledAndroidOverlay/Android.mk
  packages/overlays/IconPackFilledLauncherOverlay/Android.mk
  packages/overlays/IconPackFilledSettingsOverlay/Android.mk
  packages/overlays/IconPackFilledSystemUIOverlay/Android.mk
  packages/overlays/IconPackFilledThemePickerOverlay/Android.mk
  packages/overlays/IconPackKaiAndroidOverlay/Android.mk
  packages/overlays/IconPackKaiLauncherOverlay/Android.mk
  packages/overlays/IconPackKaiSettingsOverlay/Android.mk
  packages/overlays/IconPackKaiSystemUIOverlay/Android.mk
  packages/overlays/IconPackKaiThemePickerOverlay/Android.mk
  packages/overlays/IconPackRoundedAndroidOverlay/Android.mk
  packages/overlays/IconPackRoundedLauncherOverlay/Android.mk
  packages/overlays/IconPackRoundedSettingsOverlay/Android.mk
  packages/overlays/IconPackRoundedSystemUIOverlay/Android.mk
  packages/overlays/IconPackRoundedThemePickerOverlay/Android.mk
  packages/overlays/IconPackSamAndroidOverlay/Android.mk
  packages/overlays/IconPackSamLauncherOverlay/Android.mk
  packages/overlays/IconPackSamSettingsOverlay/Android.mk
  packages/overlays/IconPackSamSystemUIOverlay/Android.mk
  packages/overlays/IconPackSamThemePickerOverlay/Android.mk
  packages/overlays/IconPackVictorAndroidOverlay/Android.mk
  packages/overlays/IconPackVictorLauncherOverlay/Android.mk
  packages/overlays/IconPackVictorSettingsOverlay/Android.mk
  packages/overlays/IconPackVictorSystemUIOverlay/Android.mk
  packages/overlays/IconPackVictorThemePickerOverlay/Android.mk
  packages/overlays/IconShapeHeartOverlay/Android.mk
  packages/overlays/IconShapePebbleOverlay/Android.mk
  packages/overlays/IconShapeRoundedRectOverlay/Android.mk
  packages/overlays/IconShapeSquareOverlay/Android.mk
  packages/overlays/IconShapeSquircleOverlay/Android.mk
  packages/overlays/IconShapeTaperedRectOverlay/Android.mk
  packages/overlays/IconShapeTeardropOverlay/Android.mk
  packages/overlays/IconShapeVesselOverlay/Android.mk
  packages/overlays/NavigationBarMode2ButtonOverlay/Android.mk
  packages/overlays/NavigationBarMode3ButtonOverlay/Android.mk
  packages/overlays/NavigationBarModeGesturalOverlay/Android.mk
  packages/overlays/NavigationBarModeGesturalOverlayExtraWideBack/Android.mk
  packages/overlays/NavigationBarModeGesturalOverlayNarrowBack/Android.mk
  packages/overlays/NavigationBarModeGesturalOverlayWideBack/Android.mk
  services/tests/servicestests/test-apps/PackageParsingTestManifests/Android.bp
  tests/Camera2Tests/CameraToo/Android.mk
  tests/Camera2Tests/CameraToo/tests/Android.mk
  tests/Camera2Tests/SmartCamera/SimpleCamera/Android.mk
  tests/Camera2Tests/SmartCamera/SimpleCamera/tests/Android.mk
  tests/CanvasCompare/Android.mk
  tests/FlickerTests/test-apps/Android.bp
  tests/LockTaskTests/Android.mk
  tests/SoundTriggerTests/Android.mk
  tools/aapt2/integration-tests/MergeOnlyTest/App/Android.mk
  tools/aapt2/integration-tests/NamespaceTest/App/Android.mk
  tools/aapt2/integration-tests/NamespaceTest/Split/Android.mk
  tools/fonts/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I90231075f135176668586b903f2c85ec350fd527
2021-04-21 20:55:12 +00:00
Benedict Wong
6e8c1d6da7 Add support for retrieval of configured VCNs by carrier privilege
This change adds support for retrieval of a list of subscription groups
that have a VCN configured.

Bug: 184612525
Test: atest FrameworksVcnTests
Change-Id: I40553a7bb45d9b1f948c7d0a791f1b22a422d55c
2021-04-21 13:49:14 -07:00
Yan Yan
c65ed07b59 Merge "Include PORT_4500 option when encoding IkeSessionParams" 2021-04-21 18:08:33 +00:00
Benedict Wong
9ef01fca2a Merge "Rename get/setRetryInterval to get/setRetryIntervalsMs" 2021-04-21 17:06:45 +00:00
James Mattis
1b7a5e282c Merge "Correctly count nri uid request counts" 2021-04-21 02:06:33 +00:00
Benedict Wong
85d294282c Rename get/setRetryInterval to get/setRetryIntervalsMs
Per API feedback, the get/set methods for retry intervals are renamed to
be plural, and have time units

Bug: 184612525
Test: atest FrameworksVcnTests
Test: atest CtsVcnTestCases
Change-Id: I51b3ffcfa44f72805f359e56b263da2558325372
2021-04-21 00:44:37 +00:00
Yan Yan
c130a2a8b1 Include PORT_4500 option when encoding IkeSessionParams
This commit makes sure IKE_OPTION_FORCE_PORT_4500 is included
when converting IkeSessionParams to a PersistableBundle.

Bug: 185637142
Test: atest IkeSessionParamsUtilsTest
Change-Id: I1fcd6d26e64217091ad960a1c51659046e70a6ac
2021-04-20 16:41:00 -07:00
Benedict Wong
c66289ebd2 Merge changes Ib0690243,I0cabce70,I8f13a0d8,I81efeaa4,I488f6208
* changes:
  Switch to using NetworkScore instead of legacy integer
  Remove use of network scores, and provider IDs in VcnNetworkProvider
  Improve dump detail
  Disable INTERNET/DUN when mobile data toggled off
  Remove hidden connectivity method access in FrameworksVcnTests
2021-04-20 20:37:15 +00:00
Nazanin Bakhshi
68bf2c52e5 Merge "Refactoring and mocking to make sure unit test doesn't call the real service" 2021-04-20 15:44:00 +00:00
Treehugger Robot
1f43a69d91 Merge "Roll forward: add a test for ParseException" 2021-04-20 10:03:56 +00:00
Remi NGUYEN VAN
fe737812ce Merge "Revert "Add a test for ParseException"" 2021-04-20 09:25:07 +00:00
Remi NGUYEN VAN
52c46df5d9 Update TEST_MAPPING imports for connectivity
Connectivity CTS tests were moved from cts/tests/net to
packages/modules/Connectivity.

Bug: 185751610
Change-Id: Id4efd99c419706a52ad5d708888097bd6312d4e6
Test: treehugger is needed to test
2021-04-20 07:10:41 +00:00
Remi NGUYEN VAN
8f5efb2702 Roll forward: add a test for ParseException
The test simply creates an exception and verifies that it has the
required fields.

The constructor tests are only run on S+ as they are not part of the
API before that.

Change-Id: Ic30a34d3203c1b40923ba783a34f0cfed53a07ae
Test: atest FrameworksNetTests
2021-04-20 16:04:33 +09:00
Remi NGUYEN VAN
c3915fc7e7 Revert "Add a test for ParseException"
This reverts commit 54e707a62e.

Reason for revert: Test broken on R: b/185751610

Change-Id: I9f5d25c0ba81011848ab3cf7ec44aa329fbb3b0f
2021-04-20 16:04:33 +09:00
James Mattis
e13786d7b3 Correctly count nri uid request counts
Correctly count nri uid request counts in the per-app functionality in
connectivity currently used by set profile and set oem network
preference APIs. Previously, upon creation, nris would be created prior
to removing them. This would cause the uid request counts to
artificially increase and incorrectly throw an error if the request
count limit was hit even though in actuality an apps request count was
valid.

E.g., if there was an existing request for per-app functionality and
its owning app made a change to the per-app requests, it would double
count the existing requests. If the current count was say, one under the
limit, an error would be thrown even though it was being replaced which
should have resulted in no net change to the request count limit if
working correctly.

This patch will allow for the requests to be removed prior to creation
so that request counts are tabulated correctly.

Bug: 185849563
Bug: 183785319
Test: atest FrameworksNetTests
Change-Id: I13da0c81256cc02bea6aff2fe1ef99d6f6b0e764
2021-04-19 19:28:23 -07:00
Nazanin
52cb2e1571 Refactoring and mocking to make sure unit test doesn't call the real service
Bug: 180938364
Test: utest
Change-Id: Ic6a5a84c1d985fa02f8cf52c8c2ff144669b30c1
2021-04-19 17:12:05 -07:00