Merge "Add 2 Settings.Global keys for Settings ExternalProvider." (38663ab2) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+13 −0

Original line number	Original line	Diff line number	Diff line
	@@ -9217,6 +9217,19 @@ public final class Settings {
	/** {@hide} */		/** {@hide} */
	public static final String STORAGE_BENCHMARK_INTERVAL = "storage_benchmark_interval";		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.		* Sample validity in seconds to configure for the system DNS resolver.
	* {@hide}		* {@hide}

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -383,6 +383,8 @@ public class SettingsBackupTest {
	Settings.Global.SETUP_PREPAID_DATA_SERVICE_URL,		Settings.Global.SETUP_PREPAID_DATA_SERVICE_URL,
	Settings.Global.SETUP_PREPAID_DETECTION_REDIR_HOST,		Settings.Global.SETUP_PREPAID_DETECTION_REDIR_HOST,
	Settings.Global.SETUP_PREPAID_DETECTION_TARGET_URL,		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.SHORTCUT_MANAGER_CONSTANTS,
	Settings.Global.SHOW_FIRST_CRASH_DIALOG,		Settings.Global.SHOW_FIRST_CRASH_DIALOG,
	Settings.Global.SHOW_MUTE_IN_CRASH_DIALOG,		Settings.Global.SHOW_MUTE_IN_CRASH_DIALOG,
	@@ -705,3 +707,4 @@ public class SettingsBackupTest {
	}		}

	}		}