Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b4ec6815 authored by Yi-an Chen's avatar Yi-an Chen Committed by Automerger Merge Worker
Browse files

Merge "Add config flag for OEM to control PbA" into tm-dev am: 90cd705e am:... 

Merge "Add config flag for OEM to control PbA" into tm-dev am: 90cd705e am: 40a2fac8 am: 14a0d136 am: 689a9fc1

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



Change-Id: I8696b0b72d7c29dc63447b0081de91c7f34b9c80
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 99f9d8cb 689a9fc1

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -5699,6 +5699,9 @@ 
    <!-- Determines whether SafetyCenter feature is enabled. -->

    <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. -->

    <bool name="config_settingsHelpLinksEnabled">false</bool>

core/res/res/values/symbols.xml

+2 −0
Original line number Diff line number Diff line
@@ -4755,6 +4755,8 @@ 


  <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_deviceSpecificDeviceStatePolicyProvider" />