Add the new xml config values for content protection service

Bug: 275732576
Test: Manual testing
Change-Id: I6f8269b9a8e1f8a40685097277d75b074ae32441
This commit is contained in:
Nino Jagar
2023-05-18 17:54:07 +00:00
parent ca8950256d
commit 54d5e47969
3 changed files with 15 additions and 0 deletions

View File

@@ -4429,6 +4429,14 @@
-->
<string name="config_defaultContentCaptureService" translatable="false"></string>
<!-- The package name for the system's content protection service.
This service must be trusted, as it can be activated without explicit consent of the user.
If no service with the specified name exists on the device, content protection will be
disabled.
Example: "com.android.contentprotection/.ContentProtectionService"
-->
<string name="config_defaultContentProtectionService" translatable="false"></string>
<!-- The package name for the system's augmented autofill service.
This service must be trusted, as it can be activated without explicit consent of the user.
If no service with the specified name exists on the device, augmented autofill wil be

View File

@@ -3761,6 +3761,7 @@
<java-symbol type="string" name="config_defaultTextClassifierPackage" />
<java-symbol type="string" name="config_defaultWellbeingPackage" />
<java-symbol type="string" name="config_defaultContentCaptureService" />
<java-symbol type="string" name="config_defaultContentProtectionService" />
<java-symbol type="string" name="config_defaultAugmentedAutofillService" />
<java-symbol type="string" name="config_defaultTranslationService" />
<java-symbol type="string" name="config_defaultAppPredictionService" />

View File

@@ -3255,6 +3255,12 @@ public final class SystemServer implements Dumpable {
Slog.d(TAG, "ContentCaptureService disabled because resource is not overlaid");
return;
}
if (!deviceHasConfigString(context, R.string.config_defaultContentProtectionService)) {
Slog.d(
TAG,
"ContentProtectionService disabled because resource is not overlaid,"
+ " ContentCaptureService still enabled");
}
}
t.traceBegin("StartContentCaptureService");