Add 2 Settings.Global keys for Settings ExternalProvider.
Bug: 111941143
Test: rebuild
Change-Id: I8ee5b17601f85fc2ab9f7dea2824800405a188c5
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index ebd90bd..5f9f2db 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -9148,6 +9148,19 @@
/** {@hide} */
public static final String STORAGE_BENCHMARK_INTERVAL = "storage_benchmark_interval";
+ /**
+ * Whether or not Settings should enable psd API.
+ * {@hide}
+ */
+ public static final String SETTINGS_USE_PSD_API = "settings_use_psd_api";
+
+ /**
+ * Whether or not Settings should enable external provider API.
+ * {@hide}
+ */
+ public static final String SETTINGS_USE_EXTERNAL_PROVIDER_API =
+ "settings_use_external_provider_api";
+
/**
* Sample validity in seconds to configure for the system DNS resolver.
* {@hide}
diff --git a/core/tests/coretests/src/android/provider/SettingsBackupTest.java b/core/tests/coretests/src/android/provider/SettingsBackupTest.java
index 37dec13..3f6dc8f 100644
--- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java
+++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java
@@ -383,6 +383,8 @@
Settings.Global.SETUP_PREPAID_DATA_SERVICE_URL,
Settings.Global.SETUP_PREPAID_DETECTION_REDIR_HOST,
Settings.Global.SETUP_PREPAID_DETECTION_TARGET_URL,
+ Settings.Global.SETTINGS_USE_EXTERNAL_PROVIDER_API,
+ Settings.Global.SETTINGS_USE_PSD_API,
Settings.Global.SHORTCUT_MANAGER_CONSTANTS,
Settings.Global.SHOW_FIRST_CRASH_DIALOG,
Settings.Global.SHOW_MUTE_IN_CRASH_DIALOG,
@@ -708,3 +710,4 @@
}
}
+