Merge remote-tracking branch 'aosp/upstream-master' into androidx-platform-dev

* aosp/upstream-master:
  Sync from upstream.
  Sync from upstream.

Descriptions:
======================================================================
Export Icing logging tag to JNI
======================================================================
Update export_to_aosp.sh to change icing log tag to "AppSearchIcing"
======================================================================
Improve the logic of NamespaceChecker.
======================================================================
Step 4.1: Use ScoredDocumentHitsRanker in ResultStateV2
======================================================================
Step 4.0: Create ScoredDocumentHitsRanker interface and PriorityQueueScoredDocumentHitsRanker
======================================================================
Refactor KeyMapper
======================================================================
Change Icing DEFAULT_LOGGING_LEVEL to INFO
======================================================================
Step 3.4: Create ResultRetrieverV2GroupResultLimiterTest (copied from ResultStateTest)
======================================================================
Add IcingDynamicTrie::IsBranchingTerm to check if a term is branching.
======================================================================
Fix IcingDynamicTrie::Delete bug
======================================================================
Step 3.3: Create ResultRetrieverV2ProjectionTest (copied from ResultRetrieverTest)
======================================================================
Step 3.2: Create ResultRetrieverV2SnippetTest (copied from ResultRetrieverTest)
======================================================================
Step 3.1: Create ResultRetrieverV2Test (copied from ResultRetrieverTest)
======================================================================
Enable legacy multidex
======================================================================
Fix NPE caused by improper handling of return value of GetFileSize.
======================================================================
Step 3.0: Create ResultRetrieverV2 (copied from ResultRetriever)
======================================================================
Step 2: Create PageResult (copied from PageResultState)
======================================================================
Change AppSearch hawkeye testing app multidex to legacy.
======================================================================
Fix icing-search-engine_benchmark bug
======================================================================
(Small fix for step 1) Fix unit test stack memory error
======================================================================
Step 1: Create ResultStateV2 and ResultStateV2Test (copied from ResultState, ResultStateTest)
======================================================================

Bug: 146903474
Bug: 152934343
Bug: 193919210
Bug: 231368517
Bug: 232273174
Bug: 233470404
Bug: 233657885
Test: ./gradlew appsearch:appsearch:connectedCheck appsearch:appsearch-local-storage:connectedCheck appsearch:appsearch-platform-storage:connectedCheck
Change-Id: Icd76eab5cbe8fd945b7fca84de881c298904ce0c

2 files changed, 14 insertions, 0 deletions

diff --git a/java/src/com/google/android/icing/IcingSearchEngine.java b/java/src/com/google/android/icing/IcingSearchEngine.java
index 26ec465..16a4a4a 100644
--- a/java/src/com/google/android/icing/IcingSearchEngine.java
+++ b/java/src/com/google/android/icing/IcingSearchEngine.java
@@ -16,6 +16,7 @@ package com.google.android.icing;
 
 import android.util.Log;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import com.google.android.icing.proto.DebugInfoResultProto;
 import com.google.android.icing.proto.DebugInfoVerbosity;
 import com.google.android.icing.proto.DeleteByNamespaceResultProto;
@@ -620,6 +621,15 @@ public class IcingSearchEngine implements Closeable {
     return nativeSetLoggingLevel((short) severity.getNumber(), verbosity);
   }
 
+  @Nullable
+  public static String getLoggingTag() {
+    String tag = nativeGetLoggingTag();
+    if (tag == null) {
+      Log.e(TAG, "Received null logging tag from native.");
+    }
+    return tag;
+  }
+
   private static native long nativeCreate(byte[] icingSearchEngineOptionsBytes);
 
   private static native void nativeDestroy(IcingSearchEngine instance);
@@ -684,4 +694,6 @@ public class IcingSearchEngine implements Closeable {
   private static native boolean nativeShouldLog(short severity, short verbosity);
 
   private static native boolean nativeSetLoggingLevel(short severity, short verbosity);
+
+  private static native String nativeGetLoggingTag();
 }
diff --git a/java/tests/instrumentation/src/com/google/android/icing/IcingSearchEngineTest.java b/java/tests/instrumentation/src/com/google/android/icing/IcingSearchEngineTest.java
index 99390f9..c690990 100644
--- a/java/tests/instrumentation/src/com/google/android/icing/IcingSearchEngineTest.java
+++ b/java/tests/instrumentation/src/com/google/android/icing/IcingSearchEngineTest.java
@@ -775,6 +775,8 @@ public final class IcingSearchEngineTest {
     assertThat(IcingSearchEngine.setLoggingLevel(LogSeverity.Code.VERBOSE, (short) 1)).isTrue();
     assertThat(IcingSearchEngine.shouldLog(LogSeverity.Code.VERBOSE, (short) 1)).isTrue();
     assertThat(IcingSearchEngine.shouldLog(LogSeverity.Code.VERBOSE, (short) 2)).isFalse();
+
+    assertThat(IcingSearchEngine.getLoggingTag()).isNotEmpty();
   }
 
   private static void assertStatusOk(StatusProto status) {