Merge "Add config flag for OEM to control PbA"

This commit is contained in:
Yi-an Chen
2022-06-22 17:43:31 +00:00
committed by Android (Google) Code Review
3 changed files with 4 additions and 1 deletions

View File

@@ -387,6 +387,7 @@ package android {
public static final class R.bool {
field public static final int config_enableQrCodeScannerOnLockScreen = 17891336; // 0x1110008
field public static final int config_safetyProtectionEnabled;
field public static final int config_sendPackageName = 17891328; // 0x1110000
field public static final int config_showDefaultAssistant = 17891329; // 0x1110001
field public static final int config_showDefaultEmergency = 17891330; // 0x1110002

View File

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

View File

@@ -162,6 +162,8 @@
</staging-public-group>
<staging-public-group type="bool" first-id="0x01be0000">
<!-- @hide @SystemApi -->
<public name="config_safetyProtectionEnabled" />
</staging-public-group>
<staging-public-group type="fraction" first-id="0x01bd0000">