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

Commit ed78fdd8 authored by Pinyao Ting's avatar Pinyao Ting Committed by Android (Google) Code Review
Browse files

Merge "Permission to access shortcuts in AppSearch to Launcher and Assistant" into tm-dev

parents 463ff8db 7dd9c3b6

services/core/java/com/android/server/pm/ShortcutPackage.java

+9 −14
Original line number Original line Diff line number Diff line
@@ -26,7 +26,6 @@ import android.app.appsearch.AppSearchSession; 
import android.app.appsearch.BatchResultCallback;

import android.app.appsearch.BatchResultCallback;

import android.app.appsearch.GenericDocument;

import android.app.appsearch.GenericDocument;

import android.app.appsearch.GetByDocumentIdRequest;

import android.app.appsearch.GetByDocumentIdRequest;

import android.app.appsearch.PackageIdentifier;

import android.app.appsearch.PutDocumentsRequest;

import android.app.appsearch.PutDocumentsRequest;

import android.app.appsearch.RemoveByDocumentIdRequest;

import android.app.appsearch.RemoveByDocumentIdRequest;

import android.app.appsearch.ReportUsageRequest;

import android.app.appsearch.ReportUsageRequest;
@@ -183,11 +182,6 @@ class ShortcutPackage extends ShortcutPackageItem { 
     */

     */

    private final ArrayList<ShareTargetInfo> mShareTargets = new ArrayList<>(0);

    private final ArrayList<ShareTargetInfo> mShareTargets = new ArrayList<>(0);





    /**

     * All external packages that have gained access to the shortcuts from this package

     */

    private final Map<String, PackageIdentifier> mPackageIdentifiers = new ArrayMap<>(0);



    /**

    /**

     * # of times the package has called rate-limited APIs.

     * # of times the package has called rate-limited APIs.

     */

     */
@@ -2316,14 +2310,15 @@ class ShortcutPackage extends ShortcutPackageItem { 
        }

        }

        SetSchemaRequest.Builder schemaBuilder = new SetSchemaRequest.Builder()

        SetSchemaRequest.Builder schemaBuilder = new SetSchemaRequest.Builder()

                .addSchemas(AppSearchShortcutPerson.SCHEMA, AppSearchShortcutInfo.SCHEMA)

                .addSchemas(AppSearchShortcutPerson.SCHEMA, AppSearchShortcutInfo.SCHEMA)

                .setForceOverride(true);

                .setForceOverride(true)

        for (PackageIdentifier pi : mPackageIdentifiers.values()) {

                .addRequiredPermissionsForSchemaTypeVisibility(AppSearchShortcutInfo.SCHEMA_TYPE,

            schemaBuilder = schemaBuilder

                        Collections.singleton(SetSchemaRequest.READ_HOME_APP_SEARCH_DATA))

                    .setSchemaTypeVisibilityForPackage(

                .addRequiredPermissionsForSchemaTypeVisibility(AppSearchShortcutInfo.SCHEMA_TYPE,

                            AppSearchShortcutPerson.SCHEMA_TYPE, true, pi)

                        Collections.singleton(SetSchemaRequest.READ_ASSISTANT_APP_SEARCH_DATA))

                    .setSchemaTypeVisibilityForPackage(

                .addRequiredPermissionsForSchemaTypeVisibility(AppSearchShortcutPerson.SCHEMA_TYPE,

                            AppSearchShortcutInfo.SCHEMA_TYPE, true, pi);

                        Collections.singleton(SetSchemaRequest.READ_HOME_APP_SEARCH_DATA))

        }

                .addRequiredPermissionsForSchemaTypeVisibility(AppSearchShortcutPerson.SCHEMA_TYPE,

                        Collections.singleton(SetSchemaRequest.READ_ASSISTANT_APP_SEARCH_DATA));

        final AndroidFuture<AppSearchSession> future = new AndroidFuture<>();

        final AndroidFuture<AppSearchSession> future = new AndroidFuture<>();

        session.setSchema(

        session.setSchema(

                schemaBuilder.build(), mExecutor, mShortcutUser.mExecutor, result -> {

                schemaBuilder.build(), mExecutor, mShortcutUser.mExecutor, result -> {