diff options
| author | 2020-03-28 08:34:55 +0000 | |
|---|---|---|
| committer | 2020-03-28 08:34:55 +0000 | |
| commit | 95955373b8380d12d7019936a863fd7071cdf62b (patch) | |
| tree | 30133f032f168f81b6a210c8cbaf7f2f32e93186 | |
| parent | 32a316ddfe0156f679af0a729c6392c7796b8629 (diff) | |
| parent | 4a90c80aa906c51d8d58ee3f853ea65d6b4bf561 (diff) | |
Merge "[settings] Add a knob to turn off incremental default" into rvc-dev
| -rw-r--r-- | core/java/android/provider/Settings.java | 12 | ||||
| -rw-r--r-- | packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java | 1 |
2 files changed, 13 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 530585d86465..fbe381b2ec15 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -13068,6 +13068,18 @@ public final class Settings { "chained_battery_attribution_enabled"; /** + * Toggle to enable/disable the incremental ADB installation by default. + * If not set, default adb installations are incremental; set to zero to use full ones. + * Note: only ADB uses it, no usages in the Framework code. + * <p> + * Type: int (0 to disable, 1 to enable) + * + * @hide + */ + public static final String ENABLE_ADB_INCREMENTAL_INSTALL_DEFAULT = + "enable_adb_incremental_install_default"; + + /** * The packages whitelisted to be run in autofill compatibility mode. The list * of packages is {@code ":"} colon delimited, and each entry has the name of the * package and an optional list of url bar resource ids (the list is delimited by diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index a36949b9e1ff..fe083812ffed 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -267,6 +267,7 @@ public class SettingsBackupTest { Settings.Global.DYNAMIC_POWER_SAVINGS_DISABLE_THRESHOLD, Settings.Global.SMART_REPLIES_IN_NOTIFICATIONS_FLAGS, Settings.Global.SMART_SUGGESTIONS_IN_NOTIFICATIONS_FLAGS, + Settings.Global.ENABLE_ADB_INCREMENTAL_INSTALL_DEFAULT, Settings.Global.ENHANCED_CONNECTIVITY_ENABLED, Settings.Global.ENHANCED_4G_MODE_ENABLED, Settings.Global.EPHEMERAL_COOKIE_MAX_SIZE_BYTES, |