Merge "Use updated DeviceConfig API's new getters to simplify invocations." (0b69c75a) · Commits · e / os / android_frameworks_base

core/java/android/view/contentcapture/ContentCaptureHelper.java

+2 −18

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@ import static android.view.contentcapture.ContentCaptureManager.LOGGING_LEVEL_DE
		import static android.view.contentcapture.ContentCaptureManager.LOGGING_LEVEL_OFF;
		import static android.view.contentcapture.ContentCaptureManager.LOGGING_LEVEL_VERBOSE;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.os.Build;
		import android.provider.DeviceConfig;
		@@ -47,21 +46,6 @@ public final class ContentCaptureHelper {
		return text == null ? null : text.length() + "_chars";
		}

		/**
		* Gets the value of a device config property from the Content Capture namespace.
		*/
		public static int getIntDeviceConfigProperty(@NonNull String key, int defaultValue) {
		final String value = DeviceConfig.getProperty(DeviceConfig.NAMESPACE_CONTENT_CAPTURE, key);
		if (value == null) return defaultValue;

		try {
		return Integer.parseInt(value);
		} catch (Exception e) {
		Log.w(TAG, "error parsing value (" + value + ") of property " + key + ": " + e);
		return defaultValue;
		}
		}

		/**
		* Gets the default logging level for the device.
		*/
		@@ -75,8 +59,8 @@ public final class ContentCaptureHelper {
		*/
		public static void setLoggingLevel() {
		final int defaultLevel = getDefaultLoggingLevel();
		final int level = getIntDeviceConfigProperty(DEVICE_CONFIG_PROPERTY_LOGGING_LEVEL,
		defaultLevel);
		final int level = DeviceConfig.getInt(DeviceConfig.NAMESPACE_CONTENT_CAPTURE,
		DEVICE_CONFIG_PROPERTY_LOGGING_LEVEL, defaultLevel);
		setLoggingLevel(level);
		}

services/contentcapture/java/com/android/server/contentcapture/ContentCaptureManagerService.java

+12 −6

Original line number	Diff line number	Diff line
		@@ -234,18 +234,23 @@ public final class ContentCaptureManagerService extends

		private void setFineTuneParamsFromDeviceConfig() {
		synchronized (mLock) {
		mDevCfgMaxBufferSize = ContentCaptureHelper.getIntDeviceConfigProperty(
		mDevCfgMaxBufferSize = DeviceConfig.getInt(
		DeviceConfig.NAMESPACE_CONTENT_CAPTURE,
		ContentCaptureManager.DEVICE_CONFIG_PROPERTY_MAX_BUFFER_SIZE,
		ContentCaptureManager.DEFAULT_MAX_BUFFER_SIZE);
		mDevCfgIdleFlushingFrequencyMs = ContentCaptureHelper.getIntDeviceConfigProperty(
		mDevCfgIdleFlushingFrequencyMs = DeviceConfig.getInt(
		DeviceConfig.NAMESPACE_CONTENT_CAPTURE,
		ContentCaptureManager.DEVICE_CONFIG_PROPERTY_IDLE_FLUSH_FREQUENCY,
		ContentCaptureManager.DEFAULT_IDLE_FLUSHING_FREQUENCY_MS);
		mDevCfgTextChangeFlushingFrequencyMs = ContentCaptureHelper.getIntDeviceConfigProperty(
		mDevCfgTextChangeFlushingFrequencyMs = DeviceConfig.getInt(
		DeviceConfig.NAMESPACE_CONTENT_CAPTURE,
		ContentCaptureManager.DEVICE_CONFIG_PROPERTY_TEXT_CHANGE_FLUSH_FREQUENCY,
		ContentCaptureManager.DEFAULT_TEXT_CHANGE_FLUSHING_FREQUENCY_MS);
		mDevCfgLogHistorySize = ContentCaptureHelper.getIntDeviceConfigProperty(
		mDevCfgLogHistorySize = DeviceConfig.getInt(
		DeviceConfig.NAMESPACE_CONTENT_CAPTURE,
		ContentCaptureManager.DEVICE_CONFIG_PROPERTY_LOG_HISTORY_SIZE, 20);
		mDevCfgIdleUnbindTimeoutMs = ContentCaptureHelper.getIntDeviceConfigProperty(
		mDevCfgIdleUnbindTimeoutMs = DeviceConfig.getInt(
		DeviceConfig.NAMESPACE_CONTENT_CAPTURE,
		ContentCaptureManager.DEVICE_CONFIG_PROPERTY_IDLE_UNBIND_TIMEOUT,
		(int) AbstractRemoteService.PERMANENT_BOUND_TIMEOUT_MS);
		if (verbose) {
		@@ -260,7 +265,8 @@ public final class ContentCaptureManagerService extends
		}

		private void setLoggingLevelFromDeviceConfig() {
		mDevCfgLoggingLevel = ContentCaptureHelper.getIntDeviceConfigProperty(
		mDevCfgLoggingLevel = DeviceConfig.getInt(
		DeviceConfig.NAMESPACE_CONTENT_CAPTURE,
		ContentCaptureManager.DEVICE_CONFIG_PROPERTY_LOGGING_LEVEL,
		ContentCaptureHelper.getDefaultLoggingLevel());
		ContentCaptureHelper.setLoggingLevel(mDevCfgLoggingLevel);