From fbe21fe661559129e10bc0e53ca72cadd790c3a6 Mon Sep 17 00:00:00 2001
From: Alexander Dorokhine <adorokhine@google.com>
Date: Mon, 14 Dec 2020 23:43:15 -0800
Subject: [PATCH] Unhide GlobalSearchSession API.

Bug: 172180369
CTS-Coverage-Bug: 175661706
Test: AppSearchManagerTest
Change-Id: Ie460dbbb226fd50cbbeb89c7d41e45cdf1bd66ca
---
 apex/appsearch/framework/api/system-current.txt               | 4 ++++
 .../java/android/app/appsearch/GlobalSearchSession.java       | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/apex/appsearch/framework/api/system-current.txt b/apex/appsearch/framework/api/system-current.txt
index 4a6194e2915db..46219d6c2d4cc 100644
--- a/apex/appsearch/framework/api/system-current.txt
+++ b/apex/appsearch/framework/api/system-current.txt
@@ -5,5 +5,9 @@ package android.app.appsearch {
     method public static void initialize();
   }
 
+  public class GlobalSearchSession {
+    method @NonNull public android.app.appsearch.SearchResults query(@NonNull String, @NonNull android.app.appsearch.SearchSpec, @NonNull java.util.concurrent.Executor);
+  }
+
 }
 
diff --git a/apex/appsearch/framework/java/android/app/appsearch/GlobalSearchSession.java b/apex/appsearch/framework/java/android/app/appsearch/GlobalSearchSession.java
index 07938b704f117..1c56a9b643e7e 100644
--- a/apex/appsearch/framework/java/android/app/appsearch/GlobalSearchSession.java
+++ b/apex/appsearch/framework/java/android/app/appsearch/GlobalSearchSession.java
@@ -19,6 +19,7 @@ package android.app.appsearch;
 
 import android.annotation.CallbackExecutor;
 import android.annotation.NonNull;
+import android.annotation.SystemApi;
 import android.os.RemoteException;
 
 import java.util.Objects;
@@ -31,6 +32,7 @@ import java.util.function.Consumer;
  * <p>Apps can retrieve indexed documents through the query API.
  * @hide
  */
+@SystemApi
 public class GlobalSearchSession {
 
     private final IAppSearchManager mService;