From fc41301cf440060c1d7f67df5b28febae9876f88 Mon Sep 17 00:00:00 2001
From: Sharon Su <susharon@google.com>
Date: Thu, 2 Feb 2023 18:25:10 +0000
Subject: [PATCH] Removed unused callbackExecutor from
 unregisterEmptyQueryResultUpdateCallback

https://screenshot.googleplex.com/3MQ4764j5B5zvFE

Bug: 267356831
Bug: 267619883

Test: atest CtsSearchUiServiceTestCases
Change-Id: I2aa3a9847fdbd4d1241ac3473e06a5cdb75a4bd1
---
 core/api/system-current.txt                     | 2 +-
 core/java/android/app/search/SearchSession.java | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index 0476d7916a38b..cf92861de6134 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -2121,7 +2121,7 @@ package android.app.search {
     method @Nullable public void query(@NonNull android.app.search.Query, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.util.List<android.app.search.SearchTarget>>);
     method public void registerEmptyQueryResultUpdateCallback(@NonNull java.util.concurrent.Executor, @NonNull android.app.search.SearchSession.Callback);
     method public void requestEmptyQueryResultUpdate();
-    method public void unregisterEmptyQueryResultUpdateCallback(@NonNull java.util.concurrent.Executor, @NonNull android.app.search.SearchSession.Callback);
+    method public void unregisterEmptyQueryResultUpdateCallback(@NonNull android.app.search.SearchSession.Callback);
   }
 
   public static interface SearchSession.Callback {
diff --git a/core/java/android/app/search/SearchSession.java b/core/java/android/app/search/SearchSession.java
index eda68ddd7e864..9e0a1d0796a44 100644
--- a/core/java/android/app/search/SearchSession.java
+++ b/core/java/android/app/search/SearchSession.java
@@ -204,7 +204,6 @@ public final class SearchSession implements AutoCloseable {
      * @param callback The callback to be unregistered.
      */
     public void unregisterEmptyQueryResultUpdateCallback(
-            @NonNull @CallbackExecutor Executor callbackExecutor,
             @NonNull Callback callback) {
         synchronized (mRegisteredCallbacks) {
             if (mIsClosed.get()) {