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

Commit ee27e296 authored by Cassie Wang's avatar Cassie Wang
Browse files

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
parent 17373ec5

apex/appsearch/service/java/com/android/server/appsearch/VisibilityStore.java

+1 −3
Original line number Diff line number Diff line
@@ -332,10 +332,8 @@ public class VisibilityStore { 
        for (Map.Entry<String, List<PackageIdentifier>> 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,