Merge "[settings] Add a knob to turn off incremental default" into rvc-dev am: 95955373b8
Change-Id: Ia78fc702f53baf6b1e0157912f034465714e8e75
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 530585d..fbe381b 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -13068,6 +13068,18 @@
"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 a36949b..fe08381 100644
--- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
+++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
@@ -267,6 +267,7 @@
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,