Pull upstream changes.

Change-Id: Iaff79337219850eb1bbede8fc1738f3051e9005e

2 files changed, 28 insertions, 2 deletions

diff --git a/icing/icing-search-engine.cc b/icing/icing-search-engine.cc
index 75ccc41..c973885 100644
--- a/icing/icing-search-engine.cc
+++ b/icing/icing-search-engine.cc
@@ -184,8 +184,9 @@ void TransformStatus(const libtextclassifier3::Status& internal_status,
     default:
       // Other internal status codes aren't supported externally yet. If it
       // should be supported, add another switch-case above.
-      ICING_LOG(FATAL)
-          << "Internal status code not supported in the external API";
+      ICING_LOG(FATAL) << IcingStringUtil::StringPrintf(
+          "Internal status code %d not supported in the external API",
+          internal_status.error_code());
       break;
   }
 
diff --git a/icing/jni/icing-search-engine-jni.cc b/icing/jni/icing-search-engine-jni.cc
index ac8d2eb..4396007 100644
--- a/icing/jni/icing-search-engine-jni.cc
+++ b/icing/jni/icing-search-engine-jni.cc
@@ -200,6 +200,31 @@ Java_com_google_android_icing_IcingSearchEngine_nativeGetAllNamespaces(
 }
 
 JNIEXPORT jbyteArray JNICALL
+Java_com_google_android_icing_IcingSearchEngine_nativeGetNextPage(
+    JNIEnv* env, jclass clazz, jlong native_pointer,
+    jlong next_page_token) {
+  icing::lib::IcingSearchEngine* icing =
+      GetIcingSearchEnginePointer(native_pointer);
+
+  icing::lib::SearchResultProto next_page_result_proto =
+      icing->GetNextPage(next_page_token);
+
+  return SerializeProtoToJniByteArray(env, next_page_result_proto);
+}
+
+JNIEXPORT void JNICALL
+Java_com_google_android_icing_IcingSearchEngine_nativeInvalidateNextPageToken(
+    JNIEnv* env, jclass clazz, jlong native_pointer,
+    jlong next_page_token) {
+  icing::lib::IcingSearchEngine* icing =
+      GetIcingSearchEnginePointer(native_pointer);
+
+  icing->InvalidateNextPageToken(next_page_token);
+
+  return;
+}
+
+JNIEXPORT jbyteArray JNICALL
 Java_com_google_android_icing_IcingSearchEngine_nativeSearch(
     JNIEnv* env, jclass clazz, jlong native_pointer,
     jbyteArray search_spec_bytes, jbyteArray scoring_spec_bytes,