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

Commit 8e5ad5d4 authored by Alexander Dorokhine's avatar Alexander Dorokhine
Browse files

Sync framework from jetpack. 

Included changes:
* 31866d: Migrate VisibilityStore to a no-op.

Bug: 169883602
Test: Presubmit
Change-Id: I9a4abbf64d29a248a0d04e883961f1a6da556802
parent 17e406e2

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

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ public final class ImplInstanceManager { 
    private static AppSearchImpl createImpl(@NonNull Context context, @UserIdInt int userId)

            throws AppSearchException {

        File appSearchDir = getAppSearchDir(context, userId);

        return AppSearchImpl.create(appSearchDir, context, /*globalQuerierPackage=*/"");

        return AppSearchImpl.create(appSearchDir, context, userId, /*globalQuerierPackage=*/"");

    }



    private static File getAppSearchDir(@NonNull Context context, @UserIdInt int userId) {

apex/appsearch/service/java/com/android/server/appsearch/external/localstorage/VisibilityStore.java→apex/appsearch/service/java/com/android/server/appsearch/VisibilityStore.java

+0 −0

File moved.

View file

apex/appsearch/service/java/com/android/server/appsearch/external/localstorage/AppSearchImpl.java

+13 −4
Original line number Diff line number Diff line
@@ -160,18 +160,25 @@ public final class AppSearchImpl { 
     */

    @NonNull

    public static AppSearchImpl create(

            @NonNull File icingDir, @NonNull Context context, @NonNull String globalQuerierPackage)

            @NonNull File icingDir,

            @NonNull Context context,

            int userId,

            @NonNull String globalQuerierPackage)

            throws AppSearchException {

        Preconditions.checkNotNull(icingDir);

        Preconditions.checkNotNull(context);

        Preconditions.checkNotNull(globalQuerierPackage);

        AppSearchImpl appSearchImpl = new AppSearchImpl(icingDir, context, globalQuerierPackage);

        AppSearchImpl appSearchImpl =

                new AppSearchImpl(icingDir, context, userId, globalQuerierPackage);

        appSearchImpl.initializeVisibilityStore();

        return appSearchImpl;

    }



    private AppSearchImpl(

            @NonNull File icingDir, @NonNull Context context, @NonNull String globalQuerierPackage)

            @NonNull File icingDir,

            @NonNull Context context,

            int userId,

            @NonNull String globalQuerierPackage)

            throws AppSearchException {

        mReadWriteLock.writeLock().lock();
@@ -184,7 +191,8 @@ public final class AppSearchImpl { 
                            .build();

            mIcingSearchEngineLocked = new IcingSearchEngine(options);



            mVisibilityStoreLocked = new VisibilityStore(this, context, globalQuerierPackage);

            mVisibilityStoreLocked =

                    new VisibilityStore(this, context, globalQuerierPackage);



            InitializeResultProto initializeResultProto = mIcingSearchEngineLocked.initialize();

            SchemaProto schemaProto;
@@ -1350,6 +1358,7 @@ public final class AppSearchImpl { 
    }



    @GuardedBy("mReadWriteLock")

    @NonNull

    @VisibleForTesting

    VisibilityStore getVisibilityStoreLocked() {

        return mVisibilityStoreLocked;

apex/appsearch/synced_jetpack_changeid.txt

+1 −1
Original line number Diff line number Diff line 
Iff96eae150c7cdd281c9ecb5d93f4ef697e89f1a
 
I03df55376689c1557c651d5b9671c40da1c35955

services/tests/servicestests/src/com/android/server/appsearch/external/localstorage/AppSearchImplTest.java

+14 −389

File changed.

Preview size limit exceeded, changes collapsed.