Sync from upstream.

Descriptions:

==========
Add last optimized time to GetOptimizeInfo.

==========
Update the implementation of snippeting to return property paths with value indices and remove the values_index field.

==========
Create builders for SchemaProto, SchemaTypeConfigProto and PropertyConfigProto.

==========
Rename some protos with the rules:
 - Remove "Native" prefix
 - Add "Proto" suffix for consistency with other protos

==========
Upgrade your minimum iOS version to 11.4.

==========
Fix PersistToDisk definitions to ensure that they properly call datasync. This change is meant to address the first part of ptd doc - that certain functions that claim to persist data don't actually explicitly flush.

==========
Change function call from has_field() to field()

==========
Add IcingStorageInfo.

==========
Add IndexStorageStats.

==========
Add SchemaStoreStorageStats.

==========
Add DocumentStoreStorageStats.

==========
Implement OptimizeStats.

==========
Remove the max number of results per query limit (1000) and replace it with a more flexible way to limit memory use by the result-state-manager.

==========
Add a test case to ensure we don't add UsageStore's checksum in DocumentStore's ComputeChecksum.

==========
Account for UsageStore in GetDiskUsage.

==========
Ensure that SchemaStore properly handles function calls when the schema isn't set.

==========
Remove jlpl_strict_deps feature from package declarations.

==========
Qualifies std::string in 3p directories

==========
Section restricts should influence the relevance score.

==========
Apply fixes upstream that were necessary to sync changes downstream. Also added a METADATA check to prevent any accidental adds of foo.proto.h includes.

==========
Remove the 'com.google.protobuf' to 'com.google.android.icing.protobuf' translation in the export_to_aosp script.

==========
Include usage store size in GetOptimizeInfo. This helps clients get a better idea of what savings they could get back if they called Optimize.

Change-Id: Ia2339c7987267a73c49dadf1ced4a0a8ef001d4c

1 files changed, 1 insertions, 2 deletions

diff --git a/icing/index/iterator/doc-hit-info-iterator-section-restrict.cc b/icing/index/iterator/doc-hit-info-iterator-section-restrict.cc
index 8acb91a..e6ee8e3 100644
--- a/icing/index/iterator/doc-hit-info-iterator-section-restrict.cc
+++ b/icing/index/iterator/doc-hit-info-iterator-section-restrict.cc
@@ -84,8 +84,7 @@ libtextclassifier3::Status DocHitInfoIteratorSectionRestrict::Advance() {
       if (section_metadata->path == target_section_) {
         // The hit was in the target section name, return OK/found
         doc_hit_info_ = delegate_->doc_hit_info();
-        hit_intersect_section_ids_mask_ =
-            delegate_->hit_intersect_section_ids_mask();
+        hit_intersect_section_ids_mask_ = 1u << section_id;
         return libtextclassifier3::Status::OK;
       }
     }