Merge "Add config flag for OEM to control PbA" into tm-dev

This commit is contained in:
Yi-an Chen
2022-06-10 23:39:06 +00:00
committed by Android (Google) Code Review
2 changed files with 5 additions and 0 deletions

View File

@@ -5658,6 +5658,9 @@
<!-- Determines whether SafetyCenter feature is enabled. --> <!-- Determines whether SafetyCenter feature is enabled. -->
<bool name="config_enableSafetyCenter">true</bool> <bool name="config_enableSafetyCenter">true</bool>
<!-- Config for whether Safety Protection is enabled. -->
<bool name="config_safetyProtectionEnabled">false</bool>
<!-- Flag indicating if help links for Settings app should be enabled. --> <!-- Flag indicating if help links for Settings app should be enabled. -->
<bool name="config_settingsHelpLinksEnabled">false</bool> <bool name="config_settingsHelpLinksEnabled">false</bool>

View File

@@ -4738,6 +4738,8 @@
<java-symbol type="bool" name="config_enableSafetyCenter" /> <java-symbol type="bool" name="config_enableSafetyCenter" />
<java-symbol type="bool" name="config_safetyProtectionEnabled" />
<java-symbol type="string" name="config_devicePolicyManagementUpdater" /> <java-symbol type="string" name="config_devicePolicyManagementUpdater" />
<java-symbol type="string" name="config_deviceSpecificDeviceStatePolicyProvider" /> <java-symbol type="string" name="config_deviceSpecificDeviceStatePolicyProvider" />