Merge "Fix constant name"
diff --git a/geolocation/geotz_lookup/src/main/java/android/timezone/geolocation/GeoTimeZonesFinder.java b/geolocation/geotz_lookup/src/main/java/com/android/timezone/geotz/lookup/GeoTimeZonesFinder.java
similarity index 98%
rename from geolocation/geotz_lookup/src/main/java/android/timezone/geolocation/GeoTimeZonesFinder.java
rename to geolocation/geotz_lookup/src/main/java/com/android/timezone/geotz/lookup/GeoTimeZonesFinder.java
index 5223637..16cfdaf 100644
--- a/geolocation/geotz_lookup/src/main/java/android/timezone/geolocation/GeoTimeZonesFinder.java
+++ b/geolocation/geotz_lookup/src/main/java/com/android/timezone/geotz/lookup/GeoTimeZonesFinder.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package android.timezone.geolocation;
+package com.android.timezone.geotz.lookup;
import java.io.Closeable;
import java.io.File;
diff --git a/geolocation/geotz_lookup/src/main/java/android/timezone/geolocation/S2RangeFileBasedGeoTimeZonesFinder.java b/geolocation/geotz_lookup/src/main/java/com/android/timezone/geotz/lookup/S2RangeFileBasedGeoTimeZonesFinder.java
similarity index 98%
rename from geolocation/geotz_lookup/src/main/java/android/timezone/geolocation/S2RangeFileBasedGeoTimeZonesFinder.java
rename to geolocation/geotz_lookup/src/main/java/com/android/timezone/geotz/lookup/S2RangeFileBasedGeoTimeZonesFinder.java
index 2e9ab85..26b9860 100644
--- a/geolocation/geotz_lookup/src/main/java/android/timezone/geolocation/S2RangeFileBasedGeoTimeZonesFinder.java
+++ b/geolocation/geotz_lookup/src/main/java/com/android/timezone/geotz/lookup/S2RangeFileBasedGeoTimeZonesFinder.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package android.timezone.geolocation;
+package com.android.timezone.geotz.lookup;
import androidx.annotation.NonNull;
diff --git a/geolocation/geotz_lookup/src/test/java/android/timezone/geolocation/GeoTimeZonesFinderTest.java b/geolocation/geotz_lookup/src/test/java/com/android/timezone/geotz/lookup/GeoTimeZonesFinderTest.java
similarity index 97%
rename from geolocation/geotz_lookup/src/test/java/android/timezone/geolocation/GeoTimeZonesFinderTest.java
rename to geolocation/geotz_lookup/src/test/java/com/android/timezone/geotz/lookup/GeoTimeZonesFinderTest.java
index 4ec817b..903b7fb 100644
--- a/geolocation/geotz_lookup/src/test/java/android/timezone/geolocation/GeoTimeZonesFinderTest.java
+++ b/geolocation/geotz_lookup/src/test/java/com/android/timezone/geotz/lookup/GeoTimeZonesFinderTest.java
@@ -13,12 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package android.timezone.geolocation;
+package com.android.timezone.geotz.lookup;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
-import android.timezone.geolocation.GeoTimeZonesFinder.LocationToken;
+import com.android.timezone.geotz.lookup.GeoTimeZonesFinder.LocationToken;
import org.junit.After;
import org.junit.Before;
diff --git a/geolocation/locationtzprovider/src/main/java/com/android/timezone/geotz/provider/EnvironmentImpl.java b/geolocation/locationtzprovider/src/main/java/com/android/timezone/geotz/provider/EnvironmentImpl.java
index 00b6ef1..60fc294 100644
--- a/geolocation/locationtzprovider/src/main/java/com/android/timezone/geotz/provider/EnvironmentImpl.java
+++ b/geolocation/locationtzprovider/src/main/java/com/android/timezone/geotz/provider/EnvironmentImpl.java
@@ -28,12 +28,12 @@
import android.os.Handler;
import android.os.Looper;
import android.os.SystemClock;
-import android.timezone.geolocation.GeoTimeZonesFinder;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.android.location.timezone.provider.LocationTimeZoneEventUnbundled;
+import com.android.timezone.geotz.lookup.GeoTimeZonesFinder;
import com.android.timezone.geotz.provider.core.Cancellable;
import com.android.timezone.geotz.provider.core.OfflineLocationTimeZoneDelegate;
import com.android.timezone.geotz.provider.core.OfflineLocationTimeZoneDelegate.ListenModeEnum;
diff --git a/geolocation/locationtzprovider/src/main/java/com/android/timezone/geotz/provider/core/OfflineLocationTimeZoneDelegate.java b/geolocation/locationtzprovider/src/main/java/com/android/timezone/geotz/provider/core/OfflineLocationTimeZoneDelegate.java
index affcd9a..77b8865 100644
--- a/geolocation/locationtzprovider/src/main/java/com/android/timezone/geotz/provider/core/OfflineLocationTimeZoneDelegate.java
+++ b/geolocation/locationtzprovider/src/main/java/com/android/timezone/geotz/provider/core/OfflineLocationTimeZoneDelegate.java
@@ -28,8 +28,6 @@
import android.location.Location;
import android.os.SystemClock;
-import android.timezone.geolocation.GeoTimeZonesFinder;
-import android.timezone.geolocation.GeoTimeZonesFinder.LocationToken;
import androidx.annotation.GuardedBy;
import androidx.annotation.IntDef;
@@ -37,6 +35,8 @@
import androidx.annotation.Nullable;
import com.android.location.timezone.provider.LocationTimeZoneEventUnbundled;
+import com.android.timezone.geotz.lookup.GeoTimeZonesFinder;
+import com.android.timezone.geotz.lookup.GeoTimeZonesFinder.LocationToken;
import java.io.IOException;
import java.io.PrintWriter;
diff --git a/geolocation/locationtzprovider/src/test/java/com/android/timezone/geotz/provider/core/OfflineLocationTimeZoneDelegateTest.java b/geolocation/locationtzprovider/src/test/java/com/android/timezone/geotz/provider/core/OfflineLocationTimeZoneDelegateTest.java
index d7df839..602eeb9 100644
--- a/geolocation/locationtzprovider/src/test/java/com/android/timezone/geotz/provider/core/OfflineLocationTimeZoneDelegateTest.java
+++ b/geolocation/locationtzprovider/src/test/java/com/android/timezone/geotz/provider/core/OfflineLocationTimeZoneDelegateTest.java
@@ -22,12 +22,12 @@
import static org.junit.Assert.assertSame;
import android.location.Location;
-import android.timezone.geolocation.GeoTimeZonesFinder;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.android.location.timezone.provider.LocationTimeZoneEventUnbundled;
+import com.android.timezone.geotz.lookup.GeoTimeZonesFinder;
import org.junit.Before;
import org.junit.Test;
diff --git a/geolocation/validation/geonames/src/main/java/com/android/timezone/geolocation/validation/GeonamesComparison.java b/geolocation/validation/geonames/src/main/java/com/android/timezone/geolocation/validation/GeonamesComparison.java
index 3b9334b..981e4a8 100644
--- a/geolocation/validation/geonames/src/main/java/com/android/timezone/geolocation/validation/GeonamesComparison.java
+++ b/geolocation/validation/geonames/src/main/java/com/android/timezone/geolocation/validation/GeonamesComparison.java
@@ -17,14 +17,13 @@
import static java.util.stream.Collectors.toList;
-import android.timezone.geolocation.GeoTimeZonesFinder;
-
import com.android.timezone.geolocation.validation.CitiesFile.City;
import com.android.timezone.geolocation.validation.Types.KnownDifference;
import com.android.timezone.geolocation.validation.Types.KnownDifferenceMismatch;
import com.android.timezone.geolocation.validation.Types.KnownDifferences;
import com.android.timezone.geolocation.validation.Types.Result;
import com.android.timezone.geolocation.validation.Types.TestCaseId;
+import com.android.timezone.geotz.lookup.GeoTimeZonesFinder;
import com.android.timezone.tzids.TimeZoneIds;
import com.google.common.geometry.S2CellId;
import com.google.common.geometry.S2LatLng;
@@ -43,8 +42,6 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.function.LongFunction;
-import java.util.stream.Collectors;
import java.util.stream.Stream;
/**