Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add config flag for OEM to control PbA" into tm-dev am: 90cd705e68 am: 40a2fac874

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18781159

Change-Id: Iea93a5b828216d634c7bbc7e63375ef7bd549017
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yi-an Chen
2022-06-11 00:00:28 +00:00
committed by Automerger Merge Worker
parent d27b2962a4 40a2fac874
commit 1616401385
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/res/res/values/config.xml
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>

2
core/res/res/values/symbols.xml
View File

@@ -4743,6 +4743,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" />