Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c20a6b5 authored by Nino Jagar's avatar Nino Jagar Committed by Automerger Merge Worker
Browse files

Merge "Add the new xml config values for content protection service" into... 

Merge "Add the new xml config values for content protection service" into udc-qpr-dev am: fe62ffde am: 158ee35c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23321200



Change-Id: Idc2a7037d538f67f438c2a16a59640f7889c36fa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 097f9a1e 158ee35c

core/res/res/values/config.xml

+8 −0
Original line number Diff line number Diff line
@@ -4442,6 +4442,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

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -3768,6 +3768,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" />

services/java/com/android/server/SystemServer.java

+6 −0
Original line number Diff line number Diff line
@@ -3267,6 +3267,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");