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

Reverted ContentCapture kill-switch mechanism.

Browse Source 
Fixes: 121153631
Fixes: 121144410

Test: atest CtsContentCaptureServiceTestCases

Change-Id: Ic0e3fe6e93a8c2aff12eebcf9872f0082a361589
This commit is contained in:
Felipe Leme
2019-02-07 12:24:38 -08:00
parent 5e1e709992
commit 14ef461fc2
6 changed files with 62 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,6 +64,7 @@ import android.util.EventLog;
import android.util.Slog;
import android.util.TimingsTraceLog;
import android.view.WindowManager;
import android.view.contentcapture.ContentCaptureManager;
import android.view.inputmethod.InputMethodSystemProperty;
import com.android.internal.R;
@@ -2214,33 +2215,30 @@ public final class SystemServer {
}
private void startContentCaptureService(@NonNull Context context) {
// Check if it was explicitly enabled by DeviceConfig
final String settings = DeviceConfig.getProperty(DeviceConfig.ContentCapture.NAMESPACE,
DeviceConfig.ContentCapture.PROPERTY_CONTENTCAPTURE_ENABLED);
if (settings == null) {
// Better be safe than sorry...
Slog.d(TAG, "ContentCaptureService disabled because its not set by OEM");
return;
}
switch (settings) {
case "always":
// Should be used only during development
// First check if it was explicitly enabled by DeviceConfig
boolean explicitlySupported = 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) {
Slog.d(TAG, "ContentCaptureService explicitly enabled by DeviceConfig");
break;
case "default":
// Default case: check if OEM overlaid the resource that defines the service.
final String serviceName = context.getString(
com.android.internal.R.string.config_defaultContentCaptureService);
if (TextUtils.isEmpty(serviceName)) {
Slog.d(TAG, "ContentCaptureService disabled because resource is not overlaid");
return;
}
break;
default:
// Kill switch for OEMs
Slog.d(TAG, "ContentCaptureService disabled because its set to: " + settings);
} else {
Slog.d(TAG, "ContentCaptureService explicitly disabled by DeviceConfig");
return;
}
}
// Then check if OEM overlaid the resource that defines the service.
if (!explicitlySupported) {
final String serviceName = context
.getString(com.android.internal.R.string.config_defaultContentCaptureService);
if (TextUtils.isEmpty(serviceName)) {
Slog.d(TAG, "ContentCaptureService disabled because resource is not overlaid");
return;
}
}
traceBeginAndSlog("StartContentCaptureService");
mSystemServiceManager.startService(CONTENT_CAPTURE_MANAGER_SERVICE_CLASS);
traceEnd();