Update AppSearch module to build against latest SDK.
Bug: 227477120
Test: Builds, passes presubmit
Change-Id: Ie16f6b3d681c1ff6fffa35e57046df55bc714845
diff --git a/appsearch/appsearch-platform-storage/src/main/java/androidx/appsearch/platformstorage/GlobalSearchSessionImpl.java b/appsearch/appsearch-platform-storage/src/main/java/androidx/appsearch/platformstorage/GlobalSearchSessionImpl.java
index 961bd86..6ed63ee 100644
--- a/appsearch/appsearch-platform-storage/src/main/java/androidx/appsearch/platformstorage/GlobalSearchSessionImpl.java
+++ b/appsearch/appsearch-platform-storage/src/main/java/androidx/appsearch/platformstorage/GlobalSearchSessionImpl.java
@@ -68,7 +68,7 @@
// Management of observer callbacks.
@GuardedBy("mObserverCallbacksLocked")
- private final Map<ObserverCallback, android.app.appsearch.observer.AppSearchObserverCallback>
+ private final Map<ObserverCallback, android.app.appsearch.observer.ObserverCallback>
mObserverCallbacksLocked = new ArrayMap<>();
GlobalSearchSessionImpl(
@@ -183,11 +183,11 @@
}
synchronized (mObserverCallbacksLocked) {
- android.app.appsearch.observer.AppSearchObserverCallback frameworkCallback =
+ android.app.appsearch.observer.ObserverCallback frameworkCallback =
mObserverCallbacksLocked.get(observer);
if (frameworkCallback == null) {
// No stub is associated with this package and observer, so we must create one.
- frameworkCallback = new android.app.appsearch.observer.AppSearchObserverCallback() {
+ frameworkCallback = new android.app.appsearch.observer.ObserverCallback() {
@Override
public void onSchemaChanged(
@NonNull android.app.appsearch.observer.SchemaChangeInfo
@@ -213,7 +213,7 @@
// Regardless of whether this stub was fresh or not, we have to register it again
// because the user might be supplying a different spec.
try {
- mPlatformSession.addObserver(
+ mPlatformSession.registerObserverCallback(
targetPackageName,
ObserverSpecToPlatformConverter.toPlatformObserverSpec(spec),
executor,
@@ -245,7 +245,7 @@
+ " is not supported on this AppSearch implementation");
}
- android.app.appsearch.observer.AppSearchObserverCallback frameworkCallback;
+ android.app.appsearch.observer.ObserverCallback frameworkCallback;
synchronized (mObserverCallbacksLocked) {
frameworkCallback = mObserverCallbacksLocked.get(observer);
if (frameworkCallback == null) {
@@ -253,7 +253,7 @@
}
try {
- mPlatformSession.removeObserver(targetPackageName, frameworkCallback);
+ mPlatformSession.unregisterObserverCallback(targetPackageName, frameworkCallback);
} catch (android.app.appsearch.exceptions.AppSearchException e) {
throw new AppSearchException((int) e.getResultCode(), e.getMessage(), e.getCause());
}
