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

Commit 6318f13e authored by Cassie Wang's avatar Cassie Wang Committed by Automerger Merge Worker
Browse files

Merge "Fix package access bug." into sc-dev am: b2cd677e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13491932

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6c6c93afbe3d62a7dff80376dc80de6862ec9a62
parents 31094d2c b2cd677e

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -108,7 +108,7 @@ public class AppSearchManagerService extends SystemService { 
                        schemasPackageAccessibleBundles.entrySet()) {

                        schemasPackageAccessibleBundles.entrySet()) {

                    List<PackageIdentifier> packageIdentifiers =

                    List<PackageIdentifier> packageIdentifiers =

                            new ArrayList<>(entry.getValue().size());

                            new ArrayList<>(entry.getValue().size());

                    for (int i = 0; i < packageIdentifiers.size(); i++) {

                    for (int i = 0; i < entry.getValue().size(); i++) {

                        packageIdentifiers.add(new PackageIdentifier(entry.getValue().get(i)));

                        packageIdentifiers.add(new PackageIdentifier(entry.getValue().get(i)));

                    }

                    }

                    schemasPackageAccessible.put(entry.getKey(), packageIdentifiers);

                    schemasPackageAccessible.put(entry.getKey(), packageIdentifiers);

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -317,7 +317,7 @@ public final class AppSearchImpl { 
            }

            }





            Map<String, List<PackageIdentifier>> prefixedSchemasPackageAccessible =

            Map<String, List<PackageIdentifier>> prefixedSchemasPackageAccessible =

                    new ArrayMap<>(schemasNotPlatformSurfaceable.size());

                    new ArrayMap<>(schemasPackageAccessible.size());

            for (Map.Entry<String, List<PackageIdentifier>> entry :

            for (Map.Entry<String, List<PackageIdentifier>> entry :

                    schemasPackageAccessible.entrySet()) {

                    schemasPackageAccessible.entrySet()) {

                prefixedSchemasPackageAccessible.put(prefix + entry.getKey(), entry.getValue());

                prefixedSchemasPackageAccessible.put(prefix + entry.getKey(), entry.getValue());

apex/appsearch/testing/java/com/android/server/appsearch/testing/GlobalSearchSessionShimImpl.java

+10 −4
Original line number Original line Diff line number Diff line
@@ -37,8 +37,9 @@ import java.util.concurrent.ExecutorService; 
import java.util.concurrent.Executors;

import java.util.concurrent.Executors;





/**

/**

 * This test class adapts the AppSearch Framework API to ListenableFuture, so it can be tested via

 * This test class adapts the AppSearch Framework API to ListenableFuture, so it can be tested via a

 * a consistent interface.

 * consistent interface.

 *

 * @hide

 * @hide

 */

 */

public class GlobalSearchSessionShimImpl implements GlobalSearchSessionShim {

public class GlobalSearchSessionShimImpl implements GlobalSearchSessionShim {
@@ -47,7 +48,13 @@ public class GlobalSearchSessionShimImpl implements GlobalSearchSessionShim { 




    @NonNull

    @NonNull

    public static ListenableFuture<GlobalSearchSessionShim> createGlobalSearchSession() {

    public static ListenableFuture<GlobalSearchSessionShim> createGlobalSearchSession() {

        Context context = ApplicationProvider.getApplicationContext();

        return createGlobalSearchSession(ApplicationProvider.getApplicationContext());

    }



    /** Only for use when called from a non-instrumented context. */

    @NonNull

    public static ListenableFuture<GlobalSearchSessionShim> createGlobalSearchSession(

            @NonNull Context context) {

        AppSearchManager appSearchManager = context.getSystemService(AppSearchManager.class);

        AppSearchManager appSearchManager = context.getSystemService(AppSearchManager.class);

        SettableFuture<AppSearchResult<GlobalSearchSession>> future = SettableFuture.create();

        SettableFuture<AppSearchResult<GlobalSearchSession>> future = SettableFuture.create();

        ExecutorService executor = Executors.newCachedThreadPool();

        ExecutorService executor = Executors.newCachedThreadPool();
@@ -62,7 +69,6 @@ public class GlobalSearchSessionShimImpl implements GlobalSearchSessionShim { 
            @NonNull GlobalSearchSession session, @NonNull ExecutorService executor) {

            @NonNull GlobalSearchSession session, @NonNull ExecutorService executor) {

        mGlobalSearchSession = Preconditions.checkNotNull(session);

        mGlobalSearchSession = Preconditions.checkNotNull(session);

        mExecutor = Preconditions.checkNotNull(executor);

        mExecutor = Preconditions.checkNotNull(executor);



    }

    }





    @NonNull

    @NonNull