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

Commit 0310d7c1 authored by Alexander Dorokhine's avatar Alexander Dorokhine
Browse files

Make GlobalSearchSession public. 

This API is needed for 3p global query access.

Bug: 169883602
Test: N/A
Change-Id: Id5fc056caabab83127a594c0f43c77b6c63f28bf
parent 962608ee

apex/appsearch/framework/api/current.txt

+6 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ package android.app.appsearch { 
  }



  public class AppSearchManager {

    method public void createGlobalSearchSession(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<android.app.appsearch.AppSearchResult<android.app.appsearch.GlobalSearchSession>>);

    method public void createSearchSession(@NonNull android.app.appsearch.AppSearchManager.SearchContext, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<android.app.appsearch.AppSearchResult<android.app.appsearch.AppSearchSession>>);

  }
@@ -150,6 +151,11 @@ package android.app.appsearch { 
    method @NonNull public android.app.appsearch.GetByUriRequest.Builder setNamespace(@NonNull String);

  }



  public class GlobalSearchSession implements java.io.Closeable {

    method public void close();

    method @NonNull public android.app.appsearch.SearchResults query(@NonNull String, @NonNull android.app.appsearch.SearchSpec, @NonNull java.util.concurrent.Executor);

  }



  public class PackageIdentifier {

    ctor public PackageIdentifier(@NonNull String, @NonNull byte[]);

    method @NonNull public String getPackageName();

apex/appsearch/framework/api/system-current.txt

+0 −9
Original line number Diff line number Diff line 
// Signature format: 2.0

package android.app.appsearch {



  public class AppSearchManager {

    method public void createGlobalSearchSession(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<android.app.appsearch.AppSearchResult<android.app.appsearch.GlobalSearchSession>>);

  }



  public class AppSearchManagerFrameworkInitializer {

    method public static void initialize();

  }



  public class GlobalSearchSession implements java.io.Closeable {

    method public void close();

    method @NonNull public android.app.appsearch.SearchResults query(@NonNull String, @NonNull android.app.appsearch.SearchSpec, @NonNull java.util.concurrent.Executor);

  }



}

apex/appsearch/framework/java/android/app/appsearch/AppSearchManager.java

+4 −7
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ package android.app.appsearch; 


import android.annotation.CallbackExecutor;

import android.annotation.NonNull;

import android.annotation.SystemApi;

import android.annotation.SystemService;

import android.content.Context;

import android.os.Bundle;
@@ -123,8 +122,8 @@ public class AppSearchManager { 
    /**

     * Creates a new {@link AppSearchSession}.

     *

     * <p>This process requires an AppSearch native indexing file system for each user. If it's not

     * created for this user, the initialization process will create one under user's directory.

     * <p>This process requires an AppSearch native indexing file system. If it's not created, the

     * initialization process will create one under the user's credential encrypted directory.

     *

     * @param searchContext The {@link SearchContext} contains all information to create a new

     *                      {@link AppSearchSession}
@@ -147,16 +146,14 @@ public class AppSearchManager { 
    /**

     * Creates a new {@link GlobalSearchSession}.

     *

     * <p>This process requires an AppSearch native indexing file system for each user. If it's not

     * created for this user, the initialization process will create one under user's directory.

     * <p>This process requires an AppSearch native indexing file system. If it's not created, the

     * initialization process will create one under the user's credential encrypted directory.

     *

     * @param executor      Executor on which to invoke the callback.

     * @param callback      The {@link AppSearchResult}&lt;{@link GlobalSearchSession}&gt; of

     *                      performing this operation. Or a {@link AppSearchResult} with failure

     *                      reason code and error information.

     * @hide

     */

    @SystemApi

    public void createGlobalSearchSession(

            @NonNull @CallbackExecutor Executor executor,

            @NonNull Consumer<AppSearchResult<GlobalSearchSession>> callback) {

apex/appsearch/framework/java/android/app/appsearch/GlobalSearchSession.java

+0 −3
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package android.app.appsearch; 


import android.annotation.CallbackExecutor;

import android.annotation.NonNull;

import android.annotation.SystemApi;

import android.annotation.UserIdInt;

import android.os.RemoteException;
@@ -34,9 +33,7 @@ import java.util.function.Consumer; 
 * This class provides global access to the centralized AppSearch index maintained by the system.

 *

 * <p>Apps can retrieve indexed documents through the query API.

 * @hide

 */

@SystemApi

public class GlobalSearchSession implements Closeable {



    private final IAppSearchManager mService;