diff options
| author | Terry Wang <tytytyww@google.com> | 2021-04-19 23:29:24 -0700 |
|---|---|---|
| committer | Terry Wang <tytytyww@google.com> | 2021-04-19 23:29:24 -0700 |
| commit | 961ce055c244e957cde6a33c19704d01f141c867 (patch) | |
| tree | 416d7d142f9471f4b55e2e639a9198b06b9df71c | |
| parent | 38c5b4dece2d7d9c605cd3f0d080cf1d27ecf4b0 (diff) | |
| parent | ae9b4398bdd8924c383afba62f3c652b2fabd1c6 (diff) | |
| download | icing-961ce055c244e957cde6a33c19704d01f141c867.tar.gz | |
Merge remote-tracking branch 'goog/upstream-master' into androidx-platform-dev
* goog/upstream-master:
Sync from upstream.
Change-Id: Ibc29f55a71dcc0bf91c74a9e3649626ba903270f
| -rw-r--r-- | java/src/com/google/android/icing/IcingSearchEngine.java | 4 | ||||
| -rw-r--r-- | synced_AOSP_CL_number.txt | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/java/src/com/google/android/icing/IcingSearchEngine.java b/java/src/com/google/android/icing/IcingSearchEngine.java index 3d25908..1f5fb51 100644 --- a/java/src/com/google/android/icing/IcingSearchEngine.java +++ b/java/src/com/google/android/icing/IcingSearchEngine.java @@ -53,9 +53,11 @@ import java.io.Closeable; * * <p>If this instance has been closed, the instance is no longer usable. * + * <p>Keep this class to be non-Final so that it can be mocked in AppSearch. + * * <p>NOTE: This class is NOT thread-safe. */ -public final class IcingSearchEngine implements Closeable { +public class IcingSearchEngine implements Closeable { private static final String TAG = "IcingSearchEngine"; private static final ExtensionRegistryLite EXTENSION_REGISTRY_LITE = diff --git a/synced_AOSP_CL_number.txt b/synced_AOSP_CL_number.txt index e2be49a..a7d657e 100644 --- a/synced_AOSP_CL_number.txt +++ b/synced_AOSP_CL_number.txt @@ -1 +1 @@ -set(synced_AOSP_CL_number=368346709) +set(synced_AOSP_CL_number=368957181) |