Commit Graph

6575 Commits

Author SHA1 Message Date
Benedict Wong
0ae3528dc7 Merge "Allow provisioning package to retrieve subGrp, clear it's own config" am: 1428215bee am: 6b6f825b26 am: 4a6b279bb5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2056512

Change-Id: Ic537ef95af0424aef9f980cd124adac3dde1294a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 19:48:12 +00:00
Benedict Wong
1428215bee Merge "Allow provisioning package to retrieve subGrp, clear it's own config" 2022-04-14 17:52:15 +00:00
Benedict Wong
1a8f3e0a14 Allow provisioning package to retrieve subGrp, clear it's own config
This changes the VCN to allow a VCN provisioning package to retrieve
its listing of configured subgroups and clear its own configurations,
regardless of whether it is the active subscription group.

Safety is guaranteed based on the VCN's clearing of packages when app
data is cleared, and when the app is uninstalled. In addition to the
configurations not being retrievable, the clearing of the configs will
ensure that sideloading of an app with the same package name provides
no ability to otherwise impact settings.

Bug: 227248744
Test: atest FrameworksVcnTests
Change-Id: I2c774c00373942f895169a761d4e9a1d5b0b2edb
2022-04-13 22:10:21 +00:00
Treehugger Robot
0ec82bc2b1 Merge "Add extra logging" am: 47b98a2d38 am: 9479208dd3 am: 09d3410e51
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2056510

Change-Id: Ia004c32a217f5ec0abd695b0ec6c9f2fbf82d211
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 10:05:52 +00:00
Treehugger Robot
47b98a2d38 Merge "Add extra logging" 2022-04-13 08:16:28 +00:00
Robert Horvath
7881ffd09f Merge "Add Low Power Standby support to NetworkPolicyManagerService" 2022-04-11 08:48:34 +00:00
Chiachang Wang
dd859dc564 Merge "Update the java doc" am: b7e998e235 am: a076a5ee40 am: 9df60ac18b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2057431

Change-Id: Icf377a4cdf7ee2246286a7eb02e41040d397ea57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 04:01:46 +00:00
Chiachang Wang
b7e998e235 Merge "Update the java doc" 2022-04-11 02:54:46 +00:00
Sudheer Shanka
b57c865855 Ignore older UID state change callbacks in NPMS.
Since the onUidStateChanged() callbacks will be
happening from more than one thread, we need to make
sure we only handle the latest uid state change
callbacks and ignore any older callbacks that could
override the latest uid states in NPMS. In order to
this, every uid state change will be associated with
a unique seq number.

Also, remove the UidRecord.lastDispatchedProcStateSeq.
This was added as a safety measure to make sure we
don't unnecessarily end up waiting but it isn't
necessary and if we need to keep it, we need to add
a way to access it without holding global AMS lock,
which isn't worth the complexity.

Bug: 226299593
Test: atest tests/cts/hostside/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
Change-Id: I631f5e01f6627916a96c930c22849a1d11eab636
2022-04-08 13:45:54 -07:00
Benedict Wong
421e051e8a Add extra logging
This adds additional logs to the VCN's dumpsys to facilitate debugging
of the VCN.

Test: atest FrameworksVcnTests
Change-Id: Id8cd668991331dbf2f3395172e5cd90b36c408a9
2022-04-08 18:06:38 +00:00
Robert Horvath
56317f3ccf Add Low Power Standby support to NetworkPolicyManagerService
Bug: 190822356
Test: atest NetworkPolicyManagerServiceTest
Merged-In: I6c554df71b12bcf06f1c98ef70c35242bc90a689
Change-Id: I4b3f2625e9eed296055813e4641da9f85f8c7929
2022-04-08 14:50:42 +00:00
Chiachang Wang
4319575deb Merge "Ignore other IKE options if IkeTunnelConnectionParams is set" am: 48160f9b9b am: 3caa3cf399 am: 2194a62f15
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1978249

Change-Id: I494bcbae0a8ba83d8950db060c8f0fb3447ed050
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 11:37:31 +00:00
Chiachang Wang
240d126ed0 Update the java doc
Bug: 184750836
Test: m
Change-Id: If7a64d0a7d607dafa353c3dfd4bcbac189d1fef3
2022-04-07 18:32:09 +08:00
Chiachang Wang
48160f9b9b Merge "Ignore other IKE options if IkeTunnelConnectionParams is set" 2022-04-07 10:24:03 +00:00
Neil Fuller
0c3ae4d50e Merge "Switch core network tests from postsubmit to presubmit" am: 339c76a9ed am: 6f6e94088c am: 49ec042540
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1892638

Change-Id: Icf63a1761d9443fb49238c0b25c597735fb131d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 13:49:37 +00:00
Neil Fuller
339c76a9ed Merge "Switch core network tests from postsubmit to presubmit" 2022-04-06 12:25:06 +00:00
Chiachang Wang
3cb07d737d Ignore other IKE options if IkeTunnelConnectionParams is set
Stop parsing the IKE options from the input IkeTunnelConnectionParams
if exists. The caller shuould get the relevant infortation the
params.

The field is also stored in the VpnProfile if it built from an
Ikev2VpnProfile.

Bug: 184750836
Test: atest FrameworksNetTests HostsideVpnTests
Test: build ; flash ; connect VPN successfully
Change-Id: Id05c17285915462c7a6cd51d5fb4ee5da7f465ba
2022-04-06 17:25:58 +08:00
Sarah Chin
0bf5d39174 Merge "Ensure SubscriptionPlans can be removed" 2022-03-21 15:55:45 +00:00
Lorenzo Colitti
4aaa394f28 Merge "Store IkeTunnelConnectionParams in Ikev2VpnProfile" am: bc6f905d38 am: 492871c0b1 am: 4d46a14600
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2029924

Change-Id: Iacea8798dd865bd7900a96784a028184c41dbb89
2022-03-19 06:28:36 +00:00
Lorenzo Colitti
bc6f905d38 Merge "Store IkeTunnelConnectionParams in Ikev2VpnProfile" 2022-03-19 05:34:30 +00:00
Benedict Wong
7c3eacb6a7 Merge changes I67470903,Ia80da6d4,I332397f4 am: 7d042ad402 am: f1dacac9ea am: 639c60d696
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2030266

Change-Id: Ic90ee169932a8c5db483dea4df64c9cf0129f9a4
2022-03-18 22:32:02 +00:00
Sarah Chin
1ef011e510 Ensure SubscriptionPlans can be removed
Add a duration that the plans last and don't read to/write from disk
for plans. Make non-duration setSubscriptionPlans API deprecated.

Test: atest SubscriptionManagerTest, NetworkPolicyManagerServiceTest
Bug: 210696427
Change-Id: I93aece78eda324c333fbf9f1adbedcf46e4864f0
Merged-In: I93aece78eda324c333fbf9f1adbedcf46e4864f0
2022-03-18 15:27:57 -07:00
Benedict Wong
7d042ad402 Merge changes I67470903,Ia80da6d4,I332397f4
* changes:
  Define and implement getProvisionedVpnProfileState()
  Introduce VpnProfileState
  Define new constants of ACTION_VPN_MANAGER_EVENT
2022-03-18 21:47:47 +00:00
Sarah Chin
f3ecc6182b Merge "Update getSubscriptionPlans documentation" 2022-03-18 21:22:49 +00:00
Sarah Chin
5fe695fbdd Update getSubscriptionPlans documentation
getSubscriptionPlans can return null if a plan has not been set for the
given subId yet. Change the annotation from @NonNull -> @Nullable and
update the documentation. SubscriptionManager#getSubscriptionPlans will
return the @NonNull plans instead.

Test: build
Bug: 213896944
Change-Id: I7b232a1a695d1db7cb0d0a177bb1090e9033b805
Merged-In: I7b232a1a695d1db7cb0d0a177bb1090e9033b805
2022-03-18 09:58:47 -07:00
Neil Fuller
ad7b8429d0 Merge "Add the ability to configure NTP port for tests" am: 72e04a7dc2 am: 53d21a8591 am: 0fa758c3b8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2030083

Change-Id: Ib22fde6cf8bfba028d286647b10b1d2885d78c9d
2022-03-18 12:49:40 +00:00
Neil Fuller
72e04a7dc2 Merge "Add the ability to configure NTP port for tests" 2022-03-18 11:48:29 +00:00
lucaslin
0ae29f0cd5 Define and implement getProvisionedVpnProfileState()
CTS-Coverage-Bug: 225010642
Bug: 225010642
Test: CtsNetTestCases:Ikev2VpnTest
Change-Id: I67470903bba2f783e316be47a50c438e049ca856
2022-03-18 11:24:12 +00:00
lucaslin
f306a53e48 Introduce VpnProfileState
This class can provide the state of VPN, session key and the
settings of always-on and lockdown.

CTS-Coverage-Bug: 225010642
Bug: 225010642
Test: N/A
Change-Id: Ia80da6d4c165680f8c8c7cba0aa4246a5c5934da
2022-03-18 11:24:01 +00:00
lucaslin
836a3e3d83 Define new constants of ACTION_VPN_MANAGER_EVENT
CTS-Coverage-Bug: 225010642
Bug: 225010642
Test: N/A
Change-Id: I332397f4f65596740670d96c72c85ad216d2a1bc
2022-03-18 08:08:35 +00:00
Chiachang Wang
41e5cc7039 Store IkeTunnelConnectionParams in Ikev2VpnProfile
IkeTunnelConnectionParams contains more information than the
existing fields inside Ikev2VpnProfile. If the Ikev2VpnProfile
is built from an IkeTunnelConnectionParams, saving it to the
existing fields of Ikev2VpnProfile may cause information lost,
such as IKE options. Thus, store the IkeTunnelConnectionParams
as a field inside Ikev2VpnProfile.

The other Ike options are mutually exclusive with
IkeTunnelConnectionParams. The information such as Preshared
key or username/password may not return expected values if a
profile is built from an IkeTunnelConnectionParams. This may
confuse API callers for using the other getters. Thus, expose
a getter to retrieve IkeTunnelConnectionParams

Bug: 184750836
Test: atest FrameworksNetTests
CTS-Coverage-Bug: 184750836
Change-Id: I61e9a9549b87951956afdcbae2518228994e4729
2022-03-18 10:45:47 +08:00
Neil Fuller
187c975af9 Add the ability to configure NTP port for tests
Add the ability to configure NTP port for tests via the command line and
the associated plumbing / knock-ons.

In-progress CTS tests will run a fake NTP server on the device itself.
Binding to NTP's default port of 123 is restricted. Therefore, we need
to be able to override the port for tests.

adb shell cmd network_time_update_service set_server_config --port 9999
adb shell dumpsys network_time_update_service
<observe port value>
adb shell cmd network_time_update_service force_refresh
<observe false>

adb shell cmd network_time_update_service set_server_config
adb shell dumpsys network_time_update_service
<observe port value>
adb shell cmd network_time_update_service force_refresh
<observe true>

Bug: 213393821
Test: See above
Change-Id: I21e8b735fab268df0d617848b8a562f86560ad16
2022-03-17 11:36:19 +00:00
Frank Li
682c05e0f0 Merge "[DU04-2]Appropriate changes to the NetworkPolicyManager API" am: c48d90e91b am: acb77010ac am: 858f0d75e4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2007132

Change-Id: I7e5dc71e1705a7c205c0fd6a7cb57e75cae5a4fc
2022-03-16 13:20:10 +00:00
Frank Li
c48d90e91b Merge "[DU04-2]Appropriate changes to the NetworkPolicyManager API" 2022-03-16 12:28:24 +00:00
Frank
7c43d8fcac [DU04-2]Appropriate changes to the NetworkPolicyManager API
Divide the NetworkPolicyManager API
notifyStatsProviderWarningOrLimitReached into the following two APIs:
1. notifyStatsProviderWarningReached()
2. notifyStatsProviderLimitReached()

Bug: 216474563
Test: atest NetworkStatsServiceTest NetworkPolicyManagerTest
            NetworkPolicyManagerServiceTest OffloadControllerTest
Change-Id: Ic413eb532b5e24d4a7e2afabdcf643ab6607b1ed
2022-03-16 14:23:50 +08:00
Aaron Huang
0d7a846d6b Merge "Create @StringDef for the PREFIX_* values" am: 5e42ca0036 am: 136365ee06 am: c0c3d03595
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2022816

Change-Id: Id111cd658fc5ee877f13946d1bb747f537d050b6
2022-03-15 05:36:50 +00:00
Aaron Huang
2438554348 Create @StringDef for the PREFIX_* values
Bug: 222291489
Test: build, FrameworksNetTests
Change-Id: If54bed41e96a1b1ef169d89a0caa9e4300578374
2022-03-14 11:12:23 +08:00
Chiachang Wang
b8a6ed34bb Merge "Rename getRequiresInternetValidation to isInternetValidationRequired" am: d734ce3202 am: 8344626eba am: 590305ed33
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1990334

Change-Id: Id109413e335e1bb818f0b608927c6ce0feb10dd5
2022-03-03 01:23:15 +00:00
Chiachang Wang
d734ce3202 Merge "Rename getRequiresInternetValidation to isInternetValidationRequired" 2022-03-03 00:10:54 +00:00
lifr
c8d48831b9 [SUBID01-0]Grow NetworkIdentity to include a new mSubId field
In the previous design of NSS and NPMS, those only had IMSI to identify
the cell network. Now the telephony has created the "subId" handle,
which is the preferred mechanism for identifying subscribers.

This commit adds NetworkStats support for subscriberId as a part of
the network identity key

Bug: 80526261
Test: atest NetworkTemplateTest NetworkStatsCollectionTest
            NetworkStatsServiceTest NetworkIdentityTest
            NetworkStatsDataMigrationUtilsTest

 (cherry-picked from ag/16825721)

Change-Id: Ie1fe81006555dbcca4b62457fa6c319f04b4576d
Merged-In: Ie1fe81006555dbcca4b62457fa6c319f04b4576d
2022-03-02 11:20:09 +08:00
Chiachang Wang
b1dc9fc8d8 Rename getRequiresInternetValidation to isInternetValidationRequired
Update naming from getRequiresInternetValidation to
isInternedValdiationRequired. This addresses API
review feedback.

Bug: 220129160
Test: atest FrameworksNetTests
CTS-Coverage-Bug: 220129160
Change-Id: I9e25890af6ed73538e9e44381bf05d587808c8de
2022-03-02 01:01:20 +00:00
Jean Chalard
1028d09146 Merge "Rename EXTRA_TIMESTAMP into EXTRA_TIMESTAMP_MILLIS" am: 9709f513c1 am: 40d78c5b05 am: 59b684a1ac
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2000591

Change-Id: I6b4b986175cb4ec30002f666acd4adb034fd6199
2022-02-28 21:22:08 +00:00
Chalard Jean
d254813dde Rename EXTRA_TIMESTAMP into EXTRA_TIMESTAMP_MILLIS
Bug: 219820273
Test: m
Change-Id: I3005c045dee958c468e94ced0fac04324b77fca6
2022-02-25 17:00:49 +09:00
Frank Li
489f6d9d36 Merge "[SUBID01-0]Grow NetworkIdentity to include a new mSubId field" 2022-02-11 06:19:49 +00:00
Robert Horvath
90305697d1 Merge "Block network access in Low Power Standby" 2022-02-10 22:05:10 +00:00
Treehugger Robot
027b7e9604 Merge "Remove @hide usage and fix NetworkPolicy backup" 2022-02-10 19:37:14 +00:00
lifr
c496554d12 [SUBID01-0]Grow NetworkIdentity to include a new mSubId field
In the previous design of NSS and NPMS, those only had IMSI to identify
the cell network. Now the telephony has created the "subId" handle,
which is the preferred mechanism for identifying subscribers.

This commit adds NetworkStats support for subscriberId as a part of
the network identity key

Bug: 80526261
Test: atest NetworkTemplateTest NetworkStatsCollectionTest
            NetworkStatsServiceTest NetworkIdentityTest
            NetworkStatsDataMigrationUtilsTest
Change-Id: Ie1fe81006555dbcca4b62457fa6c319f04b4576d
2022-02-10 22:49:05 +08:00
Treehugger Robot
ed3cc1bb75 Merge "Expose VpnManager events API" am: e82d94fde0 am: 756a66d3fe am: 9107933dc6 am: 965f6b8900
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1976227

Change-Id: I2bd5eb312d7f6a05e064d433f9cb4faf1d699562
2022-02-10 13:44:44 +00:00
Robert Horvath
452ab99df9 Block network access in Low Power Standby
Bug: 190822356
Test: atest NetworkPolicyManagerServiceTest LowPowerStandbyControllerTest
Change-Id: I6c554df71b12bcf06f1c98ef70c35242bc90a689
2022-02-10 13:53:05 +01:00
Treehugger Robot
e82d94fde0 Merge "Expose VpnManager events API" 2022-02-10 12:36:37 +00:00