From e4b47994f31d462bf786149c6d69620b19698a48 Mon Sep 17 00:00:00 2001
From: Yi-an Chen <theianchen@google.com>
Date: Thu, 9 Jun 2022 16:02:58 -0700
Subject: [PATCH] Add config flag for OEM to control PbA

Bug: 213357911

Test: Manually on Raven
Change-Id: I405ae07f15be595682563e87399906b923a0395c
---
 core/api/system-current.txt            | 1 +
 core/res/res/values/config.xml         | 2 +-
 core/res/res/values/public-staging.xml | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index e224a01e367ec..ae3bbeec127c1 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -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
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index dac13ff62e3b3..7dbc76888719c 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -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>
diff --git a/core/res/res/values/public-staging.xml b/core/res/res/values/public-staging.xml
index edebc7a8b604d..11c245b4c85c9 100644
--- a/core/res/res/values/public-staging.xml
+++ b/core/res/res/values/public-staging.xml
@@ -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">