commit f876b914461c5492d94db15fa864304fb33e0578
author Joanne Chung <joannechung@google.com> Thu Mar 04 17:40:22 2021 +0800
committer Joanne Chung <joannechung@google.com> Thu Mar 04 11:18:25 2021 +0000
tree 445b6a59322ecaef98a4fd27693bae4e050b93a9
parent 073e3dddea66908404c51c2d8f7a75ae87c82cf7

Allow translation cts can add itself into allowlist for content capture

The UiTranslationManager APIs need the token that report by the
content capture, we need to have a test ContentCaptureService for
translation cts to test UiTranslationManager. So we also allow
translation cts can add itself into allow list.

Bug: 179047265
Test: atest CtsContentCaptureServiceTestCases
Test: atest CtsTranslationTestCases to make sure the service can be
connected
Change-Id: I15874ce6fc68dbb5fba0a51cf74899d2dec9bae1

core/java/android/content/ContentCaptureOptions.java

diff --git a/core/java/android/content/ContentCaptureOptions.java b/core/java/android/content/ContentCaptureOptions.java
index c296bb5..7707289 100644
--- a/core/java/android/content/ContentCaptureOptions.java
+++ b/core/java/android/content/ContentCaptureOptions.java
@@ -134,7 +134,8 @@
 
         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!");
         }