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

Commit 6ea1c2c6 authored by Rhed Jao's avatar Rhed Jao Committed by Automerger Merge Worker
Browse files

Merge "Add a configuration to enable or disable support for repair mode" into... 

Merge "Add a configuration to enable or disable support for repair mode" into udc-qpr-dev am: 9287b2a2 am: 9c021fd9

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



Change-Id: Iaeafd11d9b3aa3ae7a5d8d4ad41fbb0d77859430
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fbf0013e 9c021fd9

core/res/res/values/config.xml

+5 −0
Original line number Diff line number Diff line
@@ -6464,4 +6464,9 @@ 
    <!-- Whether the AOSP support for app cloning building blocks is to be enabled for the

         device. -->

    <bool name="config_enableAppCloningBuildingBlocks">true</bool>



    <!-- Enables or disables support for repair mode. The feature creates a secure

         environment to protect the user's privacy when the device is being repaired.

         Off by default, since OEMs may have had a similar feature on their devices. -->

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

</resources>

core/res/res/values/symbols.xml

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


  <java-symbol type="bool" name="config_safetyProtectionEnabled" />



  <java-symbol type="bool" name="config_repairModeSupported" />



  <java-symbol type="string" name="config_devicePolicyManagementUpdater" />



  <java-symbol type="string" name="config_deviceSpecificDeviceStatePolicyProvider" />