Merge "Inline some Settings constants so they don't break the SettingsBackupTest." (9bb25943) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+5 −11

Original line number	Original line	Diff line number	Diff line
	@@ -12954,12 +12954,11 @@ public final class Settings {
	* <p>Possible values are:		* <p>Possible values are:
	*		*
	* <ul>		* <ul>
	* <li>If set to {@link #CONTENT_CAPTURE_SERVICE_EXPLICITLY_ENABLED_DEFAULT}, it will only		* <li>If set to {@code default}, it will only be set if the OEM provides and defines the
	* be set if the OEM provides and defines the service name by overlaying		* service name by overlaying {@code config_defaultContentCaptureService} (this is the
	* {@code config_defaultContentCaptureService} (this is the "default" mode)		* "default" mode)
	* <li>If set to {@link #CONTENT_CAPTURE_SERVICE_EXPLICITLY_ENABLED_ALWAYS}, it will		* <li>If set to {@code always}, it will always be enabled, even when the resource is not
	* always be enabled, even when the resource is not overlaid (this is useful during		* overlaid (this is useful during development and to run the CTS tests on AOSP builds).
	* development and/or to run the CTS tests on AOSP builds).
	* <li>Otherwise, it's explicitly disabled (this could work as a "kill switch" so OEMs		* <li>Otherwise, it's explicitly disabled (this could work as a "kill switch" so OEMs
	* can disable it remotely in case of emergency by setting to something else (like		* can disable it remotely in case of emergency by setting to something else (like
	* {@code "false"}); notice that it's also disabled if the OEM doesn't explicitly set one		* {@code "false"}); notice that it's also disabled if the OEM doesn't explicitly set one
	@@ -12971,11 +12970,6 @@ public final class Settings {
	public static final String CONTENT_CAPTURE_SERVICE_EXPLICITLY_ENABLED =		public static final String CONTENT_CAPTURE_SERVICE_EXPLICITLY_ENABLED =
	"content_capture_service_explicitly_enabled";		"content_capture_service_explicitly_enabled";

	/** @hide */
	public static final String CONTENT_CAPTURE_SERVICE_EXPLICITLY_ENABLED_DEFAULT = "default";
	/** @hide */
	public static final String CONTENT_CAPTURE_SERVICE_EXPLICITLY_ENABLED_ALWAYS = "always";

	/** {@hide} */		/** {@hide} */
	public static final String ISOLATED_STORAGE_LOCAL = "isolated_storage_local";		public static final String ISOLATED_STORAGE_LOCAL = "isolated_storage_local";
	/** {@hide} */		/** {@hide} */

services/java/com/android/server/SystemServer.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2125,11 +2125,11 @@ public final class SystemServer {
	return;		return;
	}		}
	switch (settings) {		switch (settings) {
	case Settings.Global.CONTENT_CAPTURE_SERVICE_EXPLICITLY_ENABLED_ALWAYS:		case "always":
	// Should be used only during development		// Should be used only during development
	Slog.d(TAG, "ContentCaptureService explicitly enabled by Settings");		Slog.d(TAG, "ContentCaptureService explicitly enabled by Settings");
	break;		break;
	case Settings.Global.CONTENT_CAPTURE_SERVICE_EXPLICITLY_ENABLED_DEFAULT:		case "default":
	// Default case: check if OEM overlaid the resource that defines the service.		// Default case: check if OEM overlaid the resource that defines the service.
	final String serviceName = context.getString(		final String serviceName = context.getString(
	com.android.internal.R.string.config_defaultContentCaptureService);		com.android.internal.R.string.config_defaultContentCaptureService);