commit	a6d5c9e89b1956a41be46fba64064e2f6ac3099b	[log] [tgz]
author	Neil Fuller <nfuller@google.com>	Tue Nov 21 16:44:01 2023 +0000
committer	Android Build Cherrypicker Worker <android-build-cherrypicker-worker@google.com>	Tue Nov 21 16:44:01 2023 +0000
tree	72b70c45b03c53bc951528d86d2590256dcbfa48
parent	d278009ffe6872bd7c572a872f27215db5bbd9a5 [diff]

Move generic classes to com.android.storage

Move generic classes to com.android.storage from
com.android.timezone.location.storage.

Move tzs2 code to tzs2storage from s2storage directory - generic
classes, not related to TZ storage, are now separate.

Some test support classes have been split out so they can be used by
tests in multiple libraries.

Bug: 312242276
Test: Treehugger
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b3d5d26d7d4ade1c9ef9f401cb9b91e53ab09ab1)
Merged-In: Ia355db224da7010dbb1534786b84f1948f1a0263
Change-Id: Ia355db224da7010dbb1534786b84f1948f1a0263

README.md[diff]
s2storage/Android.bp[diff]
s2storage/README.md[diff]
s2storage/src/readonly/java/com/android/storage/block/read/Block.java[Renamed from s2storage/src/readonly/java/com/android/timezone/location/storage/block/read/Block.java - diff]
s2storage/src/readonly/java/com/android/storage/block/read/BlockData.java[Renamed from s2storage/src/readonly/java/com/android/timezone/location/storage/block/read/BlockData.java - diff]
s2storage/src/readonly/java/com/android/storage/block/read/BlockFileReader.java[Renamed from s2storage/src/readonly/java/com/android/timezone/location/storage/block/read/BlockFileReader.java - diff]
s2storage/src/readonly/java/com/android/storage/block/read/BlockInfo.java[Renamed from s2storage/src/readonly/java/com/android/timezone/location/storage/block/read/BlockInfo.java - diff]
s2storage/src/readonly/java/com/android/storage/io/read/TypedInputStream.java[Renamed from s2storage/src/readonly/java/com/android/timezone/location/storage/io/read/TypedInputStream.java - diff]
s2storage/src/readonly/java/com/android/storage/s2/S2CellOrdering.java[Renamed from s2storage/src/readonly/java/com/android/timezone/location/storage/s2/S2CellOrdering.java - diff]
s2storage/src/readonly/java/com/android/storage/s2/S2LevelRange.java[Renamed from s2storage/src/readonly/java/com/android/timezone/location/storage/s2/S2LevelRange.java - diff]
s2storage/src/readonly/java/com/android/storage/s2/S2Support.java[Renamed from s2storage/src/readonly/java/com/android/timezone/location/storage/s2/S2Support.java - diff]
s2storage/src/readonly/java/com/android/storage/s2/SortedS2Ranges.java[Renamed from s2storage/src/readonly/java/com/android/timezone/location/storage/s2/SortedS2Ranges.java - diff]
s2storage/src/readonly/java/com/android/storage/table/packed/read/BaseTypedPackedTable.java[Renamed from s2storage/src/readonly/java/com/android/timezone/location/storage/table/packed/read/BaseTypedPackedTable.java - diff]
s2storage/src/readonly/java/com/android/storage/table/packed/read/IntValueTypedPackedTable.java[Renamed from s2storage/src/readonly/java/com/android/timezone/location/storage/table/packed/read/IntValueTypedPackedTable.java - diff]
s2storage/src/readonly/java/com/android/storage/table/packed/read/PackedTableReader.java[Renamed from s2storage/src/readonly/java/com/android/timezone/location/storage/table/packed/read/PackedTableReader.java - diff]
s2storage/src/readonly/java/com/android/storage/table/reader/IntValueTable.java[Renamed from s2storage/src/readonly/java/com/android/timezone/location/storage/table/reader/IntValueTable.java - diff]
s2storage/src/readonly/java/com/android/storage/table/reader/LongValueTable.java[Renamed from s2storage/src/readonly/java/com/android/timezone/location/storage/table/reader/LongValueTable.java - diff]
s2storage/src/readonly/java/com/android/storage/table/reader/Table.java[Renamed from s2storage/src/readonly/java/com/android/timezone/location/storage/table/reader/Table.java - diff]
s2storage/src/readonly/java/com/android/storage/util/BitwiseUtils.java[Renamed from s2storage/src/readonly/java/com/android/timezone/location/storage/util/BitwiseUtils.java - diff]
s2storage/src/readonly/java/com/android/storage/util/Conditions.java[Renamed from s2storage/src/readonly/java/com/android/timezone/location/storage/util/Conditions.java - diff]
s2storage/src/readonly/java/com/android/storage/util/Visitor.java[Renamed from s2storage/src/readonly/java/com/android/timezone/location/storage/util/Visitor.java - diff]
s2storage/src/test/java/com/android/storage/block/BlockFileTest.java[Renamed from s2storage/src/test/java/com/android/timezone/location/storage/block/BlockFileTest.java - diff]
s2storage/src/test/java/com/android/storage/block/read/BlockDataTest.java[Renamed from s2storage/src/test/java/com/android/timezone/location/storage/block/read/BlockDataTest.java - diff]
s2storage/src/test/java/com/android/storage/block/read/BlockInfoTest.java[Renamed from s2storage/src/test/java/com/android/timezone/location/storage/block/read/BlockInfoTest.java - diff]
s2storage/src/test/java/com/android/storage/block/read/BlockMatcher.java[Renamed from s2storage/src/test/java/com/android/timezone/location/storage/block/read/BlockMatcher.java - diff]
s2storage/src/test/java/com/android/storage/block/read/BlockTest.java[Renamed from s2storage/src/test/java/com/android/timezone/location/storage/block/read/BlockTest.java - diff]
s2storage/src/test/java/com/android/storage/block/write/EmptyBlockWriterTest.java[Renamed from s2storage/src/test/java/com/android/timezone/location/storage/block/write/EmptyBlockWriterTest.java - diff]
s2storage/src/test/java/com/android/storage/io/TypedStreamsTest.java[Renamed from s2storage/src/test/java/com/android/timezone/location/storage/io/TypedStreamsTest.java - diff]
s2storage/src/test/java/com/android/storage/s2/S2CellOrderingTest.java[Renamed from s2storage/src/test/java/com/android/timezone/location/storage/s2/S2CellOrderingTest.java - diff]
s2storage/src/test/java/com/android/storage/s2/S2LevelRangeTest.java[Renamed from s2storage/src/test/java/com/android/timezone/location/storage/s2/S2LevelRangeTest.java - diff]
s2storage/src/test/java/com/android/storage/s2/S2SupportTest.java[Renamed from s2storage/src/test/java/com/android/timezone/location/storage/s2/S2SupportTest.java - diff]
s2storage/src/test/java/com/android/storage/s2/SortedS2RangesTest.java[Renamed from s2storage/src/test/java/com/android/timezone/location/storage/s2/SortedS2RangesTest.java - diff]
s2storage/src/test/java/com/android/storage/table/packed/IntValuePackedTableTest.java[Renamed from s2storage/src/test/java/com/android/timezone/location/storage/table/packed/IntValuePackedTableTest.java - diff]
s2storage/src/test/java/com/android/storage/table/packed/PackedTableReaderWriterTest.java[Renamed from s2storage/src/test/java/com/android/timezone/location/storage/table/packed/PackedTableReaderWriterTest.java - diff]
s2storage/src/test/java/com/android/storage/util/BitwiseUtilsTest.java[Renamed from s2storage/src/test/java/com/android/timezone/location/storage/util/BitwiseUtilsTest.java - diff]
s2storage/src/test/java/com/android/storage/util/ConditionsTest.java[Renamed from s2storage/src/test/java/com/android/timezone/location/storage/util/ConditionsTest.java - diff]
s2storage/src/testing/java/com/android/storage/testing/MoreAsserts.java[Renamed from s2storage/src/test/java/com/android/timezone/location/storage/testing/MoreAsserts.java - diff]
s2storage/src/testing/java/com/android/storage/testing/TestSupport.java[Renamed from s2storage/src/test/java/com/android/timezone/location/storage/testing/TestSupport.java - diff]
s2storage/src/write/java/com/android/storage/block/write/BlockFileWriter.java[Renamed from s2storage/src/write/java/com/android/timezone/location/storage/block/write/BlockFileWriter.java - diff]
s2storage/src/write/java/com/android/storage/block/write/BlockWriter.java[Renamed from s2storage/src/write/java/com/android/timezone/location/storage/block/write/BlockWriter.java - diff]
s2storage/src/write/java/com/android/storage/block/write/EmptyBlockWriter.java[Renamed from s2storage/src/write/java/com/android/timezone/location/storage/block/write/EmptyBlockWriter.java - diff]
s2storage/src/write/java/com/android/storage/io/write/TypedOutputStream.java[Renamed from s2storage/src/write/java/com/android/timezone/location/storage/io/write/TypedOutputStream.java - diff]
s2storage/src/write/java/com/android/storage/table/packed/write/PackedTableWriter.java[Renamed from s2storage/src/write/java/com/android/timezone/location/storage/table/packed/write/PackedTableWriter.java - diff]
s2storage/tools/Android.bp[diff]
s2storage/tools/src/java/com/android/storage/tools/block/DumpBlockFile.java[Renamed from s2storage/tools/src/java/com/android/timezone/location/tools/block/DumpBlockFile.java - diff]
s2storage/tools/src/java/com/android/storage/tools/block/dump/BlockDumper.java[Renamed from s2storage/tools/src/java/com/android/timezone/location/tools/block/dump/BlockDumper.java - diff]
s2storage/tools/src/java/com/android/storage/tools/block/dump/BlockFileDumper.java[Renamed from s2storage/tools/src/java/com/android/timezone/location/tools/block/dump/BlockFileDumper.java - diff]
s2storage/tools/src/java/com/android/storage/tools/block/dump/BlockInfoDumper.java[Renamed from s2storage/tools/src/java/com/android/timezone/location/tools/block/dump/BlockInfoDumper.java - diff]
s2storage/tools/src/java/com/android/storage/tools/block/dump/DumpUtils.java[Renamed from s2storage/tools/src/java/com/android/timezone/location/tools/block/dump/DumpUtils.java - diff]
s2storage/tools/src/java/com/android/storage/tools/block/dump/SingleFileDumper.java[Renamed from s2storage/tools/src/java/com/android/timezone/location/tools/block/dump/SingleFileDumper.java - diff]
tzs2storage/Android.bp[Added - diff]
tzs2storage/README.md[Added - diff]
tzs2storage/src/readonly/java/com/android/timezone/location/storage/tzs2range/BankedTzIdSets.java[Renamed from s2storage/src/readonly/java/com/android/timezone/location/storage/tzs2range/BankedTzIdSets.java - diff]
tzs2storage/src/readonly/java/com/android/timezone/location/storage/tzs2range/SuffixTableRange.java[Renamed from s2storage/src/readonly/java/com/android/timezone/location/storage/tzs2range/SuffixTableRange.java - diff]
tzs2storage/src/readonly/java/com/android/timezone/location/storage/tzs2range/SuffixTableSharedData.java[Renamed from s2storage/src/readonly/java/com/android/timezone/location/storage/tzs2range/SuffixTableSharedData.java - diff]
tzs2storage/src/readonly/java/com/android/timezone/location/storage/tzs2range/TzS2Range.java[Renamed from s2storage/src/readonly/java/com/android/timezone/location/storage/tzs2range/TzS2Range.java - diff]
tzs2storage/src/readonly/java/com/android/timezone/location/storage/tzs2range/TzS2RangeFileFormat.java[Renamed from s2storage/src/readonly/java/com/android/timezone/location/storage/tzs2range/TzS2RangeFileFormat.java - diff]
tzs2storage/src/readonly/java/com/android/timezone/location/storage/tzs2range/read/HeaderBlock.java[Renamed from s2storage/src/readonly/java/com/android/timezone/location/storage/tzs2range/read/HeaderBlock.java - diff]
tzs2storage/src/readonly/java/com/android/timezone/location/storage/tzs2range/read/PopulatedSuffixTableBlock.java[Renamed from s2storage/src/readonly/java/com/android/timezone/location/storage/tzs2range/read/PopulatedSuffixTableBlock.java - diff]
tzs2storage/src/readonly/java/com/android/timezone/location/storage/tzs2range/read/SuffixTableBlock.java[Renamed from s2storage/src/readonly/java/com/android/timezone/location/storage/tzs2range/read/SuffixTableBlock.java - diff]
tzs2storage/src/readonly/java/com/android/timezone/location/storage/tzs2range/read/SuffixTableExtraInfo.java[Renamed from s2storage/src/readonly/java/com/android/timezone/location/storage/tzs2range/read/SuffixTableExtraInfo.java - diff]
tzs2storage/src/readonly/java/com/android/timezone/location/storage/tzs2range/read/TzS2RangeFileReader.java[Renamed from s2storage/src/readonly/java/com/android/timezone/location/storage/tzs2range/read/TzS2RangeFileReader.java - diff]
tzs2storage/src/readonly/java/com/android/timezone/location/storage/tzs2range/read/UnpopulatedSuffixTableBlock.java[Renamed from s2storage/src/readonly/java/com/android/timezone/location/storage/tzs2range/read/UnpopulatedSuffixTableBlock.java - diff]
tzs2storage/src/test/java/com/android/timezone/location/storage/tzs2range/BankedTzIdSetsTest.java[Renamed from s2storage/src/test/java/com/android/timezone/location/storage/tzs2range/BankedTzIdSetsTest.java - diff]
tzs2storage/src/test/java/com/android/timezone/location/storage/tzs2range/HeaderBlockTest.java[Renamed from s2storage/src/test/java/com/android/timezone/location/storage/tzs2range/HeaderBlockTest.java - diff]
tzs2storage/src/test/java/com/android/timezone/location/storage/tzs2range/SuffixTableBlockMatcher.java[Renamed from s2storage/src/test/java/com/android/timezone/location/storage/tzs2range/SuffixTableBlockMatcher.java - diff]
tzs2storage/src/test/java/com/android/timezone/location/storage/tzs2range/SuffixTableBlockTest.java[Renamed from s2storage/src/test/java/com/android/timezone/location/storage/tzs2range/SuffixTableBlockTest.java - diff]
tzs2storage/src/test/java/com/android/timezone/location/storage/tzs2range/SuffixTableExtraInfoTest.java[Renamed from s2storage/src/test/java/com/android/timezone/location/storage/tzs2range/SuffixTableExtraInfoTest.java - diff]
tzs2storage/src/test/java/com/android/timezone/location/storage/tzs2range/SuffixTableRangeTest.java[Renamed from s2storage/src/test/java/com/android/timezone/location/storage/tzs2range/SuffixTableRangeTest.java - diff]
tzs2storage/src/test/java/com/android/timezone/location/storage/tzs2range/SuffixTableSharedDataTest.java[Renamed from s2storage/src/test/java/com/android/timezone/location/storage/tzs2range/SuffixTableSharedDataTest.java - diff]
tzs2storage/src/test/java/com/android/timezone/location/storage/tzs2range/TzS2RangeFileFormatTest.java[Renamed from s2storage/src/test/java/com/android/timezone/location/storage/tzs2range/TzS2RangeFileFormatTest.java - diff]
tzs2storage/src/test/java/com/android/timezone/location/storage/tzs2range/TzS2RangeFileTest.java[Renamed from s2storage/src/test/java/com/android/timezone/location/storage/tzs2range/TzS2RangeFileTest.java - diff]
tzs2storage/src/test/java/com/android/timezone/location/storage/tzs2range/TzS2RangeTest.java[Renamed from s2storage/src/test/java/com/android/timezone/location/storage/tzs2range/TzS2RangeTest.java - diff]
tzs2storage/src/test/java/com/android/timezone/location/storage/tzs2range/write/BankedTzIdSetsPackerTest.java[Renamed from s2storage/src/test/java/com/android/timezone/location/storage/tzs2range/write/BankedTzIdSetsPackerTest.java - diff]
tzs2storage/src/test/java/com/android/timezone/location/storage/tzs2range/write/PushBackIteratorTest.java[Renamed from s2storage/src/test/java/com/android/timezone/location/storage/tzs2range/write/PushBackIteratorTest.java - diff]
tzs2storage/src/write/java/com/android/timezone/location/storage/tzs2range/write/BankedTzIdSetsPacker.java[Renamed from s2storage/src/write/java/com/android/timezone/location/storage/tzs2range/write/BankedTzIdSetsPacker.java - diff]
tzs2storage/src/write/java/com/android/timezone/location/storage/tzs2range/write/HeaderBlockWriter.java[Renamed from s2storage/src/write/java/com/android/timezone/location/storage/tzs2range/write/HeaderBlockWriter.java - diff]
tzs2storage/src/write/java/com/android/timezone/location/storage/tzs2range/write/PushBackIterator.java[Renamed from s2storage/src/write/java/com/android/timezone/location/storage/tzs2range/write/PushBackIterator.java - diff]
tzs2storage/src/write/java/com/android/timezone/location/storage/tzs2range/write/SuffixTableSharedDataWriter.java[Renamed from s2storage/src/write/java/com/android/timezone/location/storage/tzs2range/write/SuffixTableSharedDataWriter.java - diff]
tzs2storage/src/write/java/com/android/timezone/location/storage/tzs2range/write/SuffixTableWriter.java[Renamed from s2storage/src/write/java/com/android/timezone/location/storage/tzs2range/write/SuffixTableWriter.java - diff]
tzs2storage/src/write/java/com/android/timezone/location/storage/tzs2range/write/TzS2RangeFileWriter.java[Renamed from s2storage/src/write/java/com/android/timezone/location/storage/tzs2range/write/TzS2RangeFileWriter.java - diff]
tzs2storage/tools/Android.bp[Added - diff]
tzs2storage/tools/src/java/com/android/storage/tools/block/DumpBlockFile.java[Copied from s2storage/tools/src/java/com/android/timezone/location/tools/block/DumpBlockFile.java - diff]
tzs2storage/tools/src/java/com/android/storage/tools/block/dump/BlockDumper.java[Copied from s2storage/tools/src/java/com/android/timezone/location/tools/block/dump/BlockDumper.java - diff]
tzs2storage/tools/src/java/com/android/storage/tools/block/dump/BlockFileDumper.java[Copied from s2storage/tools/src/java/com/android/timezone/location/tools/block/dump/BlockFileDumper.java - diff]
tzs2storage/tools/src/java/com/android/storage/tools/block/dump/BlockInfoDumper.java[Copied from s2storage/tools/src/java/com/android/timezone/location/tools/block/dump/BlockInfoDumper.java - diff]
tzs2storage/tools/src/java/com/android/storage/tools/block/dump/DumpUtils.java[Copied from s2storage/tools/src/java/com/android/timezone/location/tools/block/dump/DumpUtils.java - diff]
tzs2storage/tools/src/java/com/android/storage/tools/block/dump/SingleFileDumper.java[Copied from s2storage/tools/src/java/com/android/timezone/location/tools/block/dump/SingleFileDumper.java - diff]
tzs2storage/tools/src/java/com/android/timezone/location/tools/tzs2/CreateTestTzS2File.java[Renamed from s2storage/tools/src/java/com/android/timezone/location/tools/tzs2/CreateTestTzS2File.java - diff]
tzs2storage/tools/src/java/com/android/timezone/location/tools/tzs2/CreateTzS2File.java[Renamed from s2storage/tools/src/java/com/android/timezone/location/tools/tzs2/CreateTzS2File.java - diff]
tzs2storage/tools/src/java/com/android/timezone/location/tools/tzs2/DumpTzS2File.java[Renamed from s2storage/tools/src/java/com/android/timezone/location/tools/tzs2/DumpTzS2File.java - diff]
tzs2storage/tools/src/java/com/android/timezone/location/tools/tzs2/FileFormats.java[Renamed from s2storage/tools/src/java/com/android/timezone/location/tools/tzs2/FileFormats.java - diff]
tzs2storage/tools/src/java/com/android/timezone/location/tools/tzs2/dump/HeaderBlockDumper.java[Renamed from s2storage/tools/src/java/com/android/timezone/location/tools/tzs2/dump/HeaderBlockDumper.java - diff]
tzs2storage/tools/src/java/com/android/timezone/location/tools/tzs2/dump/SuffixTableBlockDumper.java[Renamed from s2storage/tools/src/java/com/android/timezone/location/tools/tzs2/dump/SuffixTableBlockDumper.java - diff]
tzs2storage/tools/src/java/com/android/timezone/location/tools/tzs2/dump/TzS2RangeFileDumper.java[Renamed from s2storage/tools/src/java/com/android/timezone/location/tools/tzs2/dump/TzS2RangeFileDumper.java - diff]
tzs2storage/tools/src/proto/geotz_protos.proto[Renamed from s2storage/tools/src/proto/geotz_protos.proto - diff]

96 files changed

tree: 72b70c45b03c53bc951528d86d2590256dcbfa48

README.md

This directory contains code, tools and data for the AOSP reference location time zone provider. Location time zone providers are used for location-based time zone detection on Android. See Android's android.service.timezone.TimeZoneProviderService class for more details.

Directory structure

apex

Files associated with a proposed mainline module APEX to hold the AOSP reference location time zone provider.

common

Utility code shared between several subdirectories.

data_pipeline

Code for a host sample / reference data generation pipeline. See run-data-pipeline.sh below.

geotz_lookup

A high-level API for performing time zone ID lookups for a location using the tzs2.dat file. Supports host and device usage.

locationtzprovider

A reference location time zone provider that uses AOSP APIs to obtain location and the geotz_lookup APIs to obtain the time zone IDs to pass to the platform.

output_data

Holds the tzs2.dat file generated by run-data-pipeline.sh along with the associated license files.

s2storage

Generic file reading / writing code and tools to support tzs2.dat generation on host, and the file's use on host and device. See s2storage/README.md for details.

tzs2storage

TZ-specific file reading / writing code and tools to support tzs2.dat generation on host, and the file's use on host and device. See tzs2storage/README.md for details.

tzbb_data

Data / licenses from the external timezone-boundary-builder project. Used as input for the reference data generation pipeline.

validation

Tooling to help validate the tzs2.dat file against other data sources.

Data file update tools

download-tzbb-files.sh

Used to refresh the data in tzbb_data/ from the timezone-boundary-builder project.

run-data-pipeline.sh

Runs the data_pipeline data generation pipeline. It takes data from tzbb_data/, processes it, and puts the resulting tzs2.dat file in output_data/.