FakeIcing#query should return Status.Code.OK
Test: atest
Change-Id: I9f6acf0a8a5a226d7afdb55a13071147a598bf4b
diff --git a/service/java/com/android/server/appsearch/impl/FakeIcing.java b/service/java/com/android/server/appsearch/impl/FakeIcing.java
index 02a79a1..d07ef4b 100644
--- a/service/java/com/android/server/appsearch/impl/FakeIcing.java
+++ b/service/java/com/android/server/appsearch/impl/FakeIcing.java
@@ -25,6 +25,7 @@
import com.google.android.icing.proto.DocumentProto;
import com.google.android.icing.proto.PropertyProto;
import com.google.android.icing.proto.SearchResultProto;
+import com.google.android.icing.proto.StatusProto;
import java.util.Locale;
import java.util.Map;
@@ -97,10 +98,12 @@
public SearchResultProto query(@NonNull String term) {
String normTerm = normalizeString(term);
Set<Integer> docIds = mIndex.get(normTerm);
+ SearchResultProto.Builder results = SearchResultProto.newBuilder()
+ .setStatus(StatusProto.newBuilder().setCode(StatusProto.Code.OK));
if (docIds == null || docIds.isEmpty()) {
- return SearchResultProto.getDefaultInstance();
+ return results.build();
}
- SearchResultProto.Builder results = SearchResultProto.newBuilder();
+
for (int docId : docIds) {
DocumentProto document = mDocStore.get(docId);
if (document != null) {
diff --git a/testing/servicestests/src/com/android/server/appsearch/impl/FakeIcingTest.java b/testing/servicestests/src/com/android/server/appsearch/impl/FakeIcingTest.java
index 6f2de7f..07b6556 100644
--- a/testing/servicestests/src/com/android/server/appsearch/impl/FakeIcingTest.java
+++ b/testing/servicestests/src/com/android/server/appsearch/impl/FakeIcingTest.java
@@ -22,6 +22,7 @@
import com.google.android.icing.proto.DocumentProto;
import com.google.android.icing.proto.PropertyProto;
import com.google.android.icing.proto.SearchResultProto;
+import com.google.android.icing.proto.StatusProto;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -117,6 +118,7 @@
private static List<String> queryGetUris(FakeIcing icing, String term) {
List<String> uris = new ArrayList<>();
SearchResultProto results = icing.query(term);
+ assertThat(results.getStatus().getCode()).isEqualTo(StatusProto.Code.OK);
for (SearchResultProto.ResultProto result : results.getResultsList()) {
uris.add(result.getDocument().getUri());
}