From 54d5e47969e9fcfda23d57e78a5b3bbfe9bf7ae3 Mon Sep 17 00:00:00 2001
From: Nino Jagar <njagar@google.com>
Date: Thu, 18 May 2023 17:54:07 +0000
Subject: [PATCH] Add the new xml config values for content protection service

Bug: 275732576
Test: Manual testing
Change-Id: I6f8269b9a8e1f8a40685097277d75b074ae32441
---
 core/res/res/values/config.xml                     | 8 ++++++++
 core/res/res/values/symbols.xml                    | 1 +
 services/java/com/android/server/SystemServer.java | 6 ++++++
 3 files changed, 15 insertions(+)

diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 114cea16980cb..8473f9bc8d0b7 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -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
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 79bb97d644d8a..ccedc2a6a1b30 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -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" />
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index af841808992ef..991248aceb4be 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -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");