From ee27e2960ad5608ecc837028feb3250ac9003f6d Mon Sep 17 00:00:00 2001 From: Cassie Wang Date: Wed, 10 Feb 2021 10:03:44 -0800 Subject: [PATCH] Remove a placeholder uri. IcingSearchEngine used to enforce that nested documents had to have a non-empty uri. This decision was relaxed to allow for empty uris upstream already. Remove the "placeholder" that we used to temporarily work around this. This shouldn't affect any visibility settings for clients since we don't actually retrieve or check what the nested document's uri is. Bug: 169883602 Test: presubmit Change-Id: Ia99d5500801ca275242814bbe8086591267e8d89 --- .../java/com/android/server/appsearch/VisibilityStore.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/apex/appsearch/service/java/com/android/server/appsearch/VisibilityStore.java b/apex/appsearch/service/java/com/android/server/appsearch/VisibilityStore.java index 64dc972d301c0..babcd25e3e265 100644 --- a/apex/appsearch/service/java/com/android/server/appsearch/VisibilityStore.java +++ b/apex/appsearch/service/java/com/android/server/appsearch/VisibilityStore.java @@ -332,10 +332,8 @@ public class VisibilityStore { for (Map.Entry> entry : schemasPackageAccessible.entrySet()) { for (int i = 0; i < entry.getValue().size(); i++) { - // TODO(b/169883602): remove the "placeholder" uri once upstream changes to relax - // nested document uri rules gets synced down. GenericDocument packageAccessibleDocument = - new GenericDocument.Builder(/*uri=*/ "placeholder", PACKAGE_ACCESSIBLE_TYPE) + new GenericDocument.Builder(/*uri=*/"", PACKAGE_ACCESSIBLE_TYPE) .setNamespace(NAMESPACE) .setPropertyString( PACKAGE_NAME_PROPERTY,