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

Commit ca38ae69 authored May 16, 2023 by Android Build Coastguard Worker

Snap for 10137062 from 03dfedbc to udc-qpr1-release

Change-Id: I99202df5b6195ef1fd0e9f0200ef8b795c5406bd

parents 14b21471 03dfedbc

core/java/android/provider/Settings.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -17990,6 +17990,15 @@ public final class Settings {
		public static final String REVIEW_PERMISSIONS_NOTIFICATION_STATE =
		"review_permissions_notification_state";

		/**
		* Whether repair mode is active on the device.
		* <p>
		* Set to 1 for true and 0 for false.
		*
		* @hide
		*/
		public static final String REPAIR_MODE_ACTIVE = "repair_mode_active";

		/**
		* Settings migrated from Wear OS settings provider.
		* @hide

core/res/res/values/config.xml

+5 −0

Original line number	Diff line number	Diff line
		@@ -6456,4 +6456,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
		@@ -4911,6 +4911,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" />

packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -592,6 +592,7 @@ public class SettingsBackupTest {
		Settings.Global.APPOP_HISTORY_BASE_INTERVAL_MILLIS,
		Settings.Global.AUTO_REVOKE_PARAMETERS,
		Settings.Global.ENABLE_RADIO_BUG_DETECTION,
		Settings.Global.REPAIR_MODE_ACTIVE,
		Settings.Global.RADIO_BUG_WAKELOCK_TIMEOUT_COUNT_THRESHOLD,
		Settings.Global.RADIO_BUG_SYSTEM_ERROR_COUNT_THRESHOLD,
		Settings.Global.ENABLED_SUBSCRIPTION_FOR_SLOT,