diff options
| author | 2024-01-12 19:42:36 +0000 | |
|---|---|---|
| committer | 2024-01-12 19:42:36 +0000 | |
| commit | 2452ea37f0d698cdbf240f7a888ee1a2f6f07fe2 (patch) | |
| tree | 502c908327e6bfaefaf9e528caf27992e42cf35a | |
| parent | 658c0765be095e54984de68d220a0b4cda72d197 (diff) | |
| parent | 22a847e70fcc6f1c8e87634095999e5daac22f6d (diff) | |
Merge changes from topic "16k_dev_ui" into main
* changes:
Add recovery permission to Settings app
Add 16k option key in settings
| -rw-r--r-- | core/java/android/provider/Settings.java | 10 | ||||
| -rw-r--r-- | data/etc/com.android.settings.xml | 1 | ||||
| -rw-r--r-- | packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java | 1 |
3 files changed, 12 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 2cc850d5c11e..7bad9c561f8a 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -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 diff --git a/data/etc/com.android.settings.xml b/data/etc/com.android.settings.xml index dcc96861bc31..fbe1b8e65171 100644 --- a/data/etc/com.android.settings.xml +++ b/data/etc/com.android.settings.xml @@ -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"/> diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index 91c72b543cc4..bc93c5b70374 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -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, |