summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2019-02-21 05:45:57 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2019-02-21 05:45:57 +0000
commitd3951c5f0d0d6c07a1a1df1cf8e00f3525f546c8 (patch)
treeff54223c49045f1b9cef677d269873f80b454ec5
parentf41a76e836504b146ea9074cde58f261d4b24ae8 (diff)
parent707387394554e13b29cb529ffba2e7aaeaea91c2 (diff)
Merge "Rename content capture variable"
-rw-r--r--services/java/com/android/server/SystemServer.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index aae159c2edcb..439a8ca41a59 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)) {