diff options
3 files changed, 22 insertions, 8 deletions
diff --git a/core/java/com/android/internal/infra/WhitelistHelper.java b/core/java/com/android/internal/infra/WhitelistHelper.java index eec82bc2403e..183b465afbfd 100644 --- a/core/java/com/android/internal/infra/WhitelistHelper.java +++ b/core/java/com/android/internal/infra/WhitelistHelper.java @@ -26,6 +26,7 @@ import android.util.Log; import com.android.internal.util.Preconditions; import java.io.PrintWriter; +import java.util.List; /** * Helper class for keeping track of whitelisted packages/activities. @@ -90,6 +91,18 @@ public final class WhitelistHelper { } /** + * Helper to use {@link #setWhitelist(ArraySet, ArraySet)} with {@link List Lists}. + */ + public void setWhitelist(@Nullable List<String> packageNames, + @Nullable List<ComponentName> components) { + final ArraySet<String> packageNamesSet = packageNames == null ? null + : new ArraySet<>(packageNames); + final ArraySet<ComponentName> componentssSet = components == null ? null + : new ArraySet<>(components); + setWhitelist(packageNamesSet, componentssSet); + } + + /** * Returns {@code true} if the entire package is whitelisted. */ public boolean isWhitelisted(@NonNull String packageName) { @@ -141,13 +154,14 @@ public final class WhitelistHelper { return; } + final String prefix2 = prefix + " "; final int size = mWhitelistedPackages.size(); pw.print(prefix); pw.print(message); pw.print(": "); pw.print(size); pw.println(" packages"); for (int i = 0; i < mWhitelistedPackages.size(); i++) { final String packageName = mWhitelistedPackages.keyAt(i); final ArraySet<ComponentName> components = mWhitelistedPackages.valueAt(i); - pw.print(prefix); pw.print(i); pw.print("."); pw.print(packageName); pw.print(": "); + pw.print(prefix2); pw.print(i); pw.print("."); pw.print(packageName); pw.print(": "); if (components == null) { pw.println("(whole package)"); continue; diff --git a/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java b/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java index 62deaffd9ea4..f5f26a35bebe 100644 --- a/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java +++ b/services/autofill/java/com/android/server/autofill/AutofillManagerServiceImpl.java @@ -906,8 +906,7 @@ final class AutofillManagerServiceImpl pw.println(mRemoteAugmentedAutofillServiceInfo); } - pw.print(prefix); pw.print("augmented autofill whitelist: "); - mAugmentedWhitelistHelper.dump(prefix2, "Whitelist", pw); + mAugmentedWhitelistHelper.dump(prefix, "Augmented autofill whitelist", pw); pw.print(prefix); pw.print("Field classification enabled: "); pw.println(isFieldClassificationEnabledLocked()); @@ -1103,6 +1102,7 @@ final class AutofillManagerServiceImpl } mRemoteAugmentedAutofillService.destroy(); mRemoteAugmentedAutofillService = null; + mRemoteAugmentedAutofillServiceInfo = null; } mRemoteAugmentedAutofillService = getRemoteAugmentedAutofillServiceLocked(); @@ -1188,8 +1188,7 @@ final class AutofillManagerServiceImpl if (mMaster.verbose) { Slog.v(TAG, "whitelisting packages: " + packages + "and activities: " + components); } - mAugmentedWhitelistHelper.setWhitelist(new ArraySet<>(packages), - new ArraySet<>(components)); + mAugmentedWhitelistHelper.setWhitelist(packages, components); mRemoteAugmentedAutofillService = getRemoteAugmentedAutofillServiceLocked(); } } diff --git a/services/contentcapture/java/com/android/server/contentcapture/ContentCapturePerUserService.java b/services/contentcapture/java/com/android/server/contentcapture/ContentCapturePerUserService.java index 955d764797c8..9df09b97da40 100644 --- a/services/contentcapture/java/com/android/server/contentcapture/ContentCapturePerUserService.java +++ b/services/contentcapture/java/com/android/server/contentcapture/ContentCapturePerUserService.java @@ -283,9 +283,10 @@ final class ContentCapturePerUserService // TODO(b/122595322): add CTS test for when it's null synchronized (mLock) { if (mMaster.verbose) { - Slog.v(TAG, "whitelisting packages: " + packages + "and activities: " + components); + Slog.v(TAG, "whitelisting packages: " + packages + " and activities: " + + components); } - mWhitelistHelper.setWhitelist(new ArraySet<>(packages), new ArraySet<>(components)); + mWhitelistHelper.setWhitelist(packages, components); } } @@ -441,7 +442,7 @@ final class ContentCapturePerUserService mRemoteService.dump(prefix2, pw); } - pw.print(prefix); pw.print("Whitelist: "); pw.println(mWhitelistHelper); + mWhitelistHelper.dump(prefix, "Whitelist", pw); if (mSessions.isEmpty()) { pw.print(prefix); pw.println("no sessions"); |