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

Commit ecc9ce72 authored Oct 16, 2023 by Eric Biggers Committed by Automerger Merge Worker Oct 16, 2023

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-dev-plus-aosp am: 62eb14b8

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

Change-Id: Ic74b31dbb0c7c7f39cb41f35bc0564c4904510a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents cc7b9e65 62eb14b8

core/res/res/values/config.xml

+5 −0

Original line number	Diff line number	Diff line
		@@ -6471,4 +6471,9 @@

		<!-- Whether unlocking and waking a device are sequenced -->
		<bool name="config_orderUnlockAndWake">false</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
		@@ -4921,6 +4921,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" />