Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename content capture variable

Browse Source 
Test: manual
Fixes: 121037717
Change-Id: I38652002e476cf53ed2aecfac52b0341dcfc784f
This commit is contained in:
Perumaal S
2019-02-20 15:58:40 -08:00
parent 311af9ea4b
commit 7073873945
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/java/com/android/server/SystemServer.java
View File

@@ -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)) {