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

Commit 2452ea37 authored Jan 12, 2024 by Pawan Wagh Committed by Gerrit Code Review Jan 12, 2024

Merge changes from topic "16k_dev_ui" into main

* changes:
  Add recovery permission to Settings app
  Add 16k option key in settings

parents 658c0765 22a847e7

core/java/android/provider/Settings.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -12961,6 +12961,16 @@ public final class Settings {
		@Readable
		public static final String OTA_DISABLE_AUTOMATIC_UPDATE = "ota_disable_automatic_update";


		/**
		* Whether to boot with 16K page size compatible kernel
		* 1 = Boot with 16K kernel
		* 0 = Boot with 4K kernel (default)
		* @hide
		*/
		@Readable
		public static final String ENABLE_16K_PAGES = "enable_16k_pages";

		/** Timeout for package verification.
		* @hide */
		@Readable

data/etc/com.android.settings.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -48,6 +48,7 @@
		<permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
		<permission name="android.permission.READ_SEARCH_INDEXABLES"/>
		<permission name="android.permission.REBOOT"/>
		<permission name="android.permission.RECOVERY"/>
		<permission name="android.permission.STATUS_BAR"/>
		<permission name="android.permission.SUGGEST_MANUAL_TIME_AND_ZONE"/>
		<permission name="android.permission.TETHER_PRIVILEGED"/>

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -280,6 +280,7 @@ public class SettingsBackupTest {
		Settings.Global.ENABLE_ADB_INCREMENTAL_INSTALL_DEFAULT,
		Settings.Global.ENABLE_MULTI_SLOT_TIMEOUT_MILLIS,
		Settings.Global.ENHANCED_4G_MODE_ENABLED,
		Settings.Global.ENABLE_16K_PAGES, // Added for 16K developer option
		Settings.Global.EPHEMERAL_COOKIE_MAX_SIZE_BYTES,
		Settings.Global.ERROR_LOGCAT_PREFIX,
		Settings.Global.EUICC_PROVISIONED,