From 707387394554e13b29cb529ffba2e7aaeaea91c2 Mon Sep 17 00:00:00 2001 From: Perumaal S Date: Wed, 20 Feb 2019 15:58:40 -0800 Subject: [PATCH] Rename content capture variable Test: manual Fixes: 121037717 Change-Id: I38652002e476cf53ed2aecfac52b0341dcfc784f --- services/java/com/android/server/SystemServer.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index aae159c2edcb9..439a8ca41a597 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -2215,12 +2215,12 @@ public final class SystemServer { private void startContentCaptureService(@NonNull Context context) { // First check if it was explicitly enabled by DeviceConfig - boolean explicitlySupported = false; + boolean explicitlyEnabled = false; String settings = DeviceConfig.getProperty(DeviceConfig.NAMESPACE_CONTENT_CAPTURE, ContentCaptureManager.DEVICE_CONFIG_PROPERTY_SERVICE_EXPLICITLY_ENABLED); if (settings != null && !settings.equalsIgnoreCase("default")) { - explicitlySupported = Boolean.parseBoolean(settings); - if (explicitlySupported) { + explicitlyEnabled = Boolean.parseBoolean(settings); + if (explicitlyEnabled) { Slog.d(TAG, "ContentCaptureService explicitly enabled by DeviceConfig"); } else { Slog.d(TAG, "ContentCaptureService explicitly disabled by DeviceConfig"); @@ -2229,7 +2229,7 @@ public final class SystemServer { } // Then check if OEM overlaid the resource that defines the service. - if (!explicitlySupported) { + if (!explicitlyEnabled) { final String serviceName = context .getString(com.android.internal.R.string.config_defaultContentCaptureService); if (TextUtils.isEmpty(serviceName)) {