diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-05-17 17:24:03 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-06-22 07:51:41 +0000 |
commit | 774f54339e5db91f785733232d3950366db65d07 (patch) | |
tree | 068e1b47bd1af94d77094ed12b604a6b83d9c22a /chromium/components/onc | |
parent | f7eaed5286974984ba5f9e3189d8f49d03e99f81 (diff) | |
download | qtwebengine-chromium-774f54339e5db91f785733232d3950366db65d07.tar.gz |
BASELINE: Update Chromium to 102.0.5005.57
Change-Id: I885f714bb40ee724c28f94ca6bd8dbdb39915158
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/components/onc')
-rw-r--r-- | chromium/components/onc/DIR_METADATA | 3 | ||||
-rw-r--r-- | chromium/components/onc/docs/onc_spec.md | 7 | ||||
-rw-r--r-- | chromium/components/onc/onc_constants.cc | 6 | ||||
-rw-r--r-- | chromium/components/onc/onc_constants.h | 5 |
4 files changed, 14 insertions, 7 deletions
diff --git a/chromium/components/onc/DIR_METADATA b/chromium/components/onc/DIR_METADATA index d7ce3c3d805..0ae9853251b 100644 --- a/chromium/components/onc/DIR_METADATA +++ b/chromium/components/onc/DIR_METADATA @@ -1,7 +1,4 @@ buganizer { component_id: 1131775 } -monorail { - component: "OS>Systems>Network>General" -} team_email: "cros-connectivity@google.com" diff --git a/chromium/components/onc/docs/onc_spec.md b/chromium/components/onc/docs/onc_spec.md index dc995570399..c3b7b8aefed 100644 --- a/chromium/components/onc/docs/onc_spec.md +++ b/chromium/components/onc/docs/onc_spec.md @@ -158,6 +158,13 @@ fetching new policy or logging in. A [Help Center article](https://support.google.com/chrome/a/answer/6326250) warns admins of the implications of mis-using this policy for Chrome OS. +* **AllowCellularSimLock** + * (optional, defaults to true) - **boolean** + * When this field is present and set to false, a SIM cannot be PIM Locked on + a managed device. If the currently active SIM is already PIN Locked when + this field turns false, the managed user will be guided to PIN unlock the + SIM. + * **AllowOnlyPolicyCellularNetworks** * (optional, defaults to false) - **boolean** * When this field is present and set to true, only cellular networks present diff --git a/chromium/components/onc/onc_constants.cc b/chromium/components/onc/onc_constants.cc index 04e50f035c8..712e372784d 100644 --- a/chromium/components/onc/onc_constants.cc +++ b/chromium/components/onc/onc_constants.cc @@ -502,6 +502,7 @@ const char kPasswordPlaceholderVerbatim[] = "${PASSWORD}"; } // namespace substitutes namespace global_network_config { +const char kAllowCellularSimLock[] = "AllowCellularSimLock"; const char kAllowOnlyPolicyCellularNetworks[] = "AllowOnlyPolicyCellularNetworks"; const char kAllowOnlyPolicyNetworksToAutoconnect[] = @@ -514,8 +515,9 @@ const char kAllowOnlyPolicyNetworksToConnectIfAvailable[] = // AllowOnlyPolicyNetworksToConnectIfAvailable field are currently only applied // to WiFi networks. TODO(crbug.com/1234561): Fix this when ONC field is // updated. -const char* kAllowOnlyPolicyWiFiToConnect = kAllowOnlyPolicyNetworksToConnect; -const char* kAllowOnlyPolicyWiFiToConnectIfAvailable = +const char* const kAllowOnlyPolicyWiFiToConnect = + kAllowOnlyPolicyNetworksToConnect; +const char* const kAllowOnlyPolicyWiFiToConnectIfAvailable = kAllowOnlyPolicyNetworksToConnectIfAvailable; const char kBlacklistedHexSSIDs[] = "BlacklistedHexSSIDs"; // Deprecated diff --git a/chromium/components/onc/onc_constants.h b/chromium/components/onc/onc_constants.h index d60c9168685..57d2e151752 100644 --- a/chromium/components/onc/onc_constants.h +++ b/chromium/components/onc/onc_constants.h @@ -513,11 +513,12 @@ COMPONENT_EXPORT(ONC) extern const char kWPAD[]; } // namespace proxy namespace global_network_config { +COMPONENT_EXPORT(ONC) extern const char kAllowCellularSimLock[]; COMPONENT_EXPORT(ONC) extern const char kAllowOnlyPolicyCellularNetworks[]; COMPONENT_EXPORT(ONC) extern const char kAllowOnlyPolicyNetworksToAutoconnect[]; -COMPONENT_EXPORT(ONC) extern const char* kAllowOnlyPolicyWiFiToConnect; +COMPONENT_EXPORT(ONC) extern const char* const kAllowOnlyPolicyWiFiToConnect; COMPONENT_EXPORT(ONC) -extern const char* kAllowOnlyPolicyWiFiToConnectIfAvailable; +extern const char* const kAllowOnlyPolicyWiFiToConnectIfAvailable; COMPONENT_EXPORT(ONC) extern const char kBlacklistedHexSSIDs[]; // Deprecated COMPONENT_EXPORT(ONC) extern const char kBlockedHexSSIDs[]; COMPONENT_EXPORT(ONC) extern const char kDisableNetworkTypes[]; |