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

Commit 5db6f21d authored by Joanne Chung's avatar Joanne Chung Committed by Automerger Merge Worker
Browse files

Merge "Allow translation cts can add itself into allowlist for content... 

Merge "Allow translation cts can add itself into allowlist for content capture" into sc-dev am: 779ea7fe

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4793d0f86007f525c1a274e659aa3a94c24e2005
parents fbcc2822 779ea7fe

core/java/android/content/ContentCaptureOptions.java

+2 −1
Original line number Diff line number Diff line
@@ -134,7 +134,8 @@ public final class ContentCaptureOptions implements Parcelable { 


        final String packageName = at.getApplication().getPackageName();



        if (!"android.contentcaptureservice.cts".equals(packageName)) {

        if (!"android.contentcaptureservice.cts".equals(packageName)

                && !"android.translation.cts".equals(packageName)) {

            Log.e(TAG, "forWhitelistingItself(): called by " + packageName);

            throw new SecurityException("Thou shall not pass!");

        }