diff options
16 files changed, 33 insertions, 35 deletions
diff --git a/location/java/com/android/internal/location/timezone/ILocationTimeZoneProviderManager.aidl b/location/java/com/android/internal/location/timezone/ILocationTimeZoneProviderManager.aidl index f89a64fc586c..b5450b7a0f88 100644 --- a/location/java/com/android/internal/location/timezone/ILocationTimeZoneProviderManager.aidl +++ b/location/java/com/android/internal/location/timezone/ILocationTimeZoneProviderManager.aidl @@ -16,7 +16,7 @@ package com.android.internal.location.timezone; -import android.location.timezone.LocationTimeZoneEvent; +import com.android.internal.location.timezone.LocationTimeZoneEvent; /** * Binder interface for the manager of location time zone provider implementations. diff --git a/location/java/android/location/timezone/LocationTimeZoneEvent.aidl b/location/java/com/android/internal/location/timezone/LocationTimeZoneEvent.aidl index 538658822930..199e0671f910 100644 --- a/location/java/android/location/timezone/LocationTimeZoneEvent.aidl +++ b/location/java/com/android/internal/location/timezone/LocationTimeZoneEvent.aidl @@ -14,6 +14,6 @@ * limitations under the License. */ -package android.location.timezone; +package com.android.internal.location.timezone; parcelable LocationTimeZoneEvent; diff --git a/location/java/android/location/timezone/LocationTimeZoneEvent.java b/location/java/com/android/internal/location/timezone/LocationTimeZoneEvent.java index 922a38921048..7eb843e93e68 100644 --- a/location/java/android/location/timezone/LocationTimeZoneEvent.java +++ b/location/java/com/android/internal/location/timezone/LocationTimeZoneEvent.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.location.timezone; +package com.android.internal.location.timezone; import android.annotation.IntDef; import android.annotation.NonNull; diff --git a/location/lib/java/com/android/location/timezone/provider/LocationTimeZoneEventUnbundled.java b/location/lib/java/com/android/location/timezone/provider/LocationTimeZoneEventUnbundled.java index 07396333b05c..d044c0b52939 100644 --- a/location/lib/java/com/android/location/timezone/provider/LocationTimeZoneEventUnbundled.java +++ b/location/lib/java/com/android/location/timezone/provider/LocationTimeZoneEventUnbundled.java @@ -18,9 +18,10 @@ package com.android.location.timezone.provider; import android.annotation.IntDef; import android.annotation.NonNull; -import android.location.timezone.LocationTimeZoneEvent; import android.os.SystemClock; +import com.android.internal.location.timezone.LocationTimeZoneEvent; + import java.util.Collections; import java.util.List; import java.util.Objects; diff --git a/services/core/java/com/android/server/location/timezone/BinderLocationTimeZoneProvider.java b/services/core/java/com/android/server/location/timezone/BinderLocationTimeZoneProvider.java index 280d59af7d2a..b4bcd7b10c42 100644 --- a/services/core/java/com/android/server/location/timezone/BinderLocationTimeZoneProvider.java +++ b/services/core/java/com/android/server/location/timezone/BinderLocationTimeZoneProvider.java @@ -25,10 +25,10 @@ import static com.android.server.location.timezone.LocationTimeZoneProvider.Prov import android.annotation.NonNull; import android.annotation.Nullable; -import android.location.timezone.LocationTimeZoneEvent; import android.util.IndentingPrintWriter; import android.util.Slog; +import com.android.internal.location.timezone.LocationTimeZoneEvent; import com.android.internal.location.timezone.LocationTimeZoneProviderRequest; import java.time.Duration; diff --git a/services/core/java/com/android/server/location/timezone/ControllerImpl.java b/services/core/java/com/android/server/location/timezone/ControllerImpl.java index 70c1aeff0ce8..07615ff58075 100644 --- a/services/core/java/com/android/server/location/timezone/ControllerImpl.java +++ b/services/core/java/com/android/server/location/timezone/ControllerImpl.java @@ -16,10 +16,9 @@ package com.android.server.location.timezone; -import static android.location.timezone.LocationTimeZoneEvent.EVENT_TYPE_PERMANENT_FAILURE; -import static android.location.timezone.LocationTimeZoneEvent.EVENT_TYPE_SUCCESS; -import static android.location.timezone.LocationTimeZoneEvent.EVENT_TYPE_UNCERTAIN; - +import static com.android.internal.location.timezone.LocationTimeZoneEvent.EVENT_TYPE_PERMANENT_FAILURE; +import static com.android.internal.location.timezone.LocationTimeZoneEvent.EVENT_TYPE_SUCCESS; +import static com.android.internal.location.timezone.LocationTimeZoneEvent.EVENT_TYPE_UNCERTAIN; import static com.android.server.location.timezone.LocationTimeZoneManagerService.debugLog; import static com.android.server.location.timezone.LocationTimeZoneManagerService.warnLog; import static com.android.server.location.timezone.LocationTimeZoneProvider.ProviderState; @@ -31,10 +30,10 @@ import static com.android.server.location.timezone.LocationTimeZoneProvider.Prov import android.annotation.NonNull; import android.annotation.Nullable; -import android.location.timezone.LocationTimeZoneEvent; import android.util.IndentingPrintWriter; import com.android.internal.annotations.GuardedBy; +import com.android.internal.location.timezone.LocationTimeZoneEvent; import com.android.server.location.timezone.ThreadingDomain.SingleRunnableQueue; import com.android.server.timezonedetector.ConfigurationInternal; import com.android.server.timezonedetector.GeolocationTimeZoneSuggestion; diff --git a/services/core/java/com/android/server/location/timezone/LocationTimeZoneManagerService.java b/services/core/java/com/android/server/location/timezone/LocationTimeZoneManagerService.java index 83f4ca2839fb..b7c7476844a5 100644 --- a/services/core/java/com/android/server/location/timezone/LocationTimeZoneManagerService.java +++ b/services/core/java/com/android/server/location/timezone/LocationTimeZoneManagerService.java @@ -42,7 +42,7 @@ import java.util.Objects; * A service class that acts as a container for the {@link LocationTimeZoneProviderController}, * which determines what {@link com.android.server.timezonedetector.GeolocationTimeZoneSuggestion} * are made to the {@link TimeZoneDetectorInternal}, and the {@link LocationTimeZoneProvider}s that - * offer {@link android.location.timezone.LocationTimeZoneEvent}s. + * (indirectly) generate {@link com.android.internal.location.timezone.LocationTimeZoneEvent}s. * * <p>For details of the time zone suggestion behavior, see {@link * LocationTimeZoneProviderController}. diff --git a/services/core/java/com/android/server/location/timezone/LocationTimeZoneProvider.java b/services/core/java/com/android/server/location/timezone/LocationTimeZoneProvider.java index 4bbda43d0e60..dc56238e2f48 100644 --- a/services/core/java/com/android/server/location/timezone/LocationTimeZoneProvider.java +++ b/services/core/java/com/android/server/location/timezone/LocationTimeZoneProvider.java @@ -16,10 +16,9 @@ package com.android.server.location.timezone; -import static android.location.timezone.LocationTimeZoneEvent.EVENT_TYPE_PERMANENT_FAILURE; -import static android.location.timezone.LocationTimeZoneEvent.EVENT_TYPE_SUCCESS; -import static android.location.timezone.LocationTimeZoneEvent.EVENT_TYPE_UNCERTAIN; - +import static com.android.internal.location.timezone.LocationTimeZoneEvent.EVENT_TYPE_PERMANENT_FAILURE; +import static com.android.internal.location.timezone.LocationTimeZoneEvent.EVENT_TYPE_SUCCESS; +import static com.android.internal.location.timezone.LocationTimeZoneEvent.EVENT_TYPE_UNCERTAIN; import static com.android.server.location.timezone.LocationTimeZoneManagerService.debugLog; import static com.android.server.location.timezone.LocationTimeZoneProvider.ProviderState.PROVIDER_STATE_DISABLED; import static com.android.server.location.timezone.LocationTimeZoneProvider.ProviderState.PROVIDER_STATE_ENABLED_CERTAIN; @@ -30,12 +29,12 @@ import static com.android.server.location.timezone.LocationTimeZoneProvider.Prov import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; -import android.location.timezone.LocationTimeZoneEvent; import android.os.Handler; import android.os.SystemClock; import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; +import com.android.internal.location.timezone.LocationTimeZoneEvent; import com.android.server.location.timezone.LocationTimeZoneProvider.ProviderState.ProviderStateEnum; import com.android.server.location.timezone.ThreadingDomain.SingleRunnableQueue; import com.android.server.timezonedetector.ConfigurationInternal; diff --git a/services/core/java/com/android/server/location/timezone/LocationTimeZoneProviderProxy.java b/services/core/java/com/android/server/location/timezone/LocationTimeZoneProviderProxy.java index 3d889ae1856a..1b4706f8801e 100644 --- a/services/core/java/com/android/server/location/timezone/LocationTimeZoneProviderProxy.java +++ b/services/core/java/com/android/server/location/timezone/LocationTimeZoneProviderProxy.java @@ -19,11 +19,11 @@ package com.android.server.location.timezone; import android.annotation.NonNull; import android.annotation.Nullable; import android.content.Context; -import android.location.timezone.LocationTimeZoneEvent; import android.os.Handler; import android.util.IndentingPrintWriter; import com.android.internal.annotations.GuardedBy; +import com.android.internal.location.timezone.LocationTimeZoneEvent; import com.android.internal.location.timezone.LocationTimeZoneProviderRequest; import com.android.server.timezonedetector.Dumpable; diff --git a/services/core/java/com/android/server/location/timezone/NullLocationTimeZoneProvider.java b/services/core/java/com/android/server/location/timezone/NullLocationTimeZoneProvider.java index 2bbae56e40c8..fbcc71fad20a 100644 --- a/services/core/java/com/android/server/location/timezone/NullLocationTimeZoneProvider.java +++ b/services/core/java/com/android/server/location/timezone/NullLocationTimeZoneProvider.java @@ -38,8 +38,8 @@ import java.time.Duration; * enters a {@link ProviderState#PROVIDER_STATE_PERM_FAILED} state immediately after being enabled * for the first time and sends the appropriate event, which ensures the {@link * LocationTimeZoneProviderController} won't expect any further {@link - * android.location.timezone.LocationTimeZoneEvent}s to come from it, and won't attempt to use it - * again. + * com.android.internal.location.timezone.LocationTimeZoneEvent}s to come from it, and won't attempt + * to use it again. */ class NullLocationTimeZoneProvider extends LocationTimeZoneProvider { diff --git a/services/core/java/com/android/server/location/timezone/RealLocationTimeZoneProviderProxy.java b/services/core/java/com/android/server/location/timezone/RealLocationTimeZoneProviderProxy.java index 94062faa7a1b..cd6d3592af0e 100644 --- a/services/core/java/com/android/server/location/timezone/RealLocationTimeZoneProviderProxy.java +++ b/services/core/java/com/android/server/location/timezone/RealLocationTimeZoneProviderProxy.java @@ -20,7 +20,6 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.content.ComponentName; import android.content.Context; -import android.location.timezone.LocationTimeZoneEvent; import android.os.IBinder; import android.os.RemoteException; import android.util.IndentingPrintWriter; @@ -28,6 +27,7 @@ import android.util.IndentingPrintWriter; import com.android.internal.annotations.GuardedBy; import com.android.internal.location.timezone.ILocationTimeZoneProvider; import com.android.internal.location.timezone.ILocationTimeZoneProviderManager; +import com.android.internal.location.timezone.LocationTimeZoneEvent; import com.android.internal.location.timezone.LocationTimeZoneProviderRequest; import com.android.server.ServiceWatcher; diff --git a/services/core/java/com/android/server/location/timezone/SimulatedBinderProviderEvent.java b/services/core/java/com/android/server/location/timezone/SimulatedBinderProviderEvent.java index 6bf6539f95dc..9d262e33274b 100644 --- a/services/core/java/com/android/server/location/timezone/SimulatedBinderProviderEvent.java +++ b/services/core/java/com/android/server/location/timezone/SimulatedBinderProviderEvent.java @@ -16,19 +16,19 @@ package com.android.server.location.timezone; -import static android.location.timezone.LocationTimeZoneEvent.EVENT_TYPE_PERMANENT_FAILURE; -import static android.location.timezone.LocationTimeZoneEvent.EVENT_TYPE_SUCCESS; -import static android.location.timezone.LocationTimeZoneEvent.EVENT_TYPE_UNCERTAIN; - +import static com.android.internal.location.timezone.LocationTimeZoneEvent.EVENT_TYPE_PERMANENT_FAILURE; +import static com.android.internal.location.timezone.LocationTimeZoneEvent.EVENT_TYPE_SUCCESS; +import static com.android.internal.location.timezone.LocationTimeZoneEvent.EVENT_TYPE_UNCERTAIN; import static com.android.server.location.timezone.LocationTimeZoneManagerService.PRIMARY_PROVIDER_NAME; import static com.android.server.location.timezone.LocationTimeZoneManagerService.SECONDARY_PROVIDER_NAME; import android.annotation.NonNull; import android.annotation.Nullable; -import android.location.timezone.LocationTimeZoneEvent; import android.os.ShellCommand; import android.os.SystemClock; +import com.android.internal.location.timezone.LocationTimeZoneEvent; + import java.io.PrintWriter; import java.util.ArrayList; import java.util.Arrays; diff --git a/services/tests/servicestests/src/android/location/timezone/LocationTimeZoneEventTest.java b/services/tests/servicestests/src/com/android/internal/location/timezone/LocationTimeZoneEventTest.java index 80373ac66109..9efb38a75f35 100644 --- a/services/tests/servicestests/src/android/location/timezone/LocationTimeZoneEventTest.java +++ b/services/tests/servicestests/src/com/android/internal/location/timezone/LocationTimeZoneEventTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package android.location.timezone; +package com.android.internal.location.timezone; -import static android.location.timezone.ParcelableTestSupport.assertRoundTripParcelable; +import static com.android.internal.location.timezone.ParcelableTestSupport.assertRoundTripParcelable; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; diff --git a/services/tests/servicestests/src/com/android/internal/location/timezone/LocationTimeZoneProviderRequestTest.java b/services/tests/servicestests/src/com/android/internal/location/timezone/LocationTimeZoneProviderRequestTest.java index 75696dac3b44..95daa36f2c40 100644 --- a/services/tests/servicestests/src/com/android/internal/location/timezone/LocationTimeZoneProviderRequestTest.java +++ b/services/tests/servicestests/src/com/android/internal/location/timezone/LocationTimeZoneProviderRequestTest.java @@ -16,7 +16,7 @@ package com.android.internal.location.timezone; -import static android.location.timezone.ParcelableTestSupport.assertRoundTripParcelable; +import static com.android.internal.location.timezone.ParcelableTestSupport.assertRoundTripParcelable; import org.junit.Test; diff --git a/services/tests/servicestests/src/android/location/timezone/ParcelableTestSupport.java b/services/tests/servicestests/src/com/android/internal/location/timezone/ParcelableTestSupport.java index 316a2e65fb30..ece5d004975d 100644 --- a/services/tests/servicestests/src/android/location/timezone/ParcelableTestSupport.java +++ b/services/tests/servicestests/src/com/android/internal/location/timezone/ParcelableTestSupport.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.location.timezone; +package com.android.internal.location.timezone; import static org.junit.Assert.assertEquals; @@ -24,7 +24,7 @@ import android.os.Parcelable; import java.lang.reflect.Field; /** Utility methods related to {@link Parcelable} objects used in several tests. */ -public final class ParcelableTestSupport { +final class ParcelableTestSupport { private ParcelableTestSupport() {} diff --git a/services/tests/servicestests/src/com/android/server/location/timezone/ControllerImplTest.java b/services/tests/servicestests/src/com/android/server/location/timezone/ControllerImplTest.java index c4b19e84bccb..3f1653718fe7 100644 --- a/services/tests/servicestests/src/com/android/server/location/timezone/ControllerImplTest.java +++ b/services/tests/servicestests/src/com/android/server/location/timezone/ControllerImplTest.java @@ -15,10 +15,9 @@ */ package com.android.server.location.timezone; -import static android.location.timezone.LocationTimeZoneEvent.EVENT_TYPE_PERMANENT_FAILURE; -import static android.location.timezone.LocationTimeZoneEvent.EVENT_TYPE_SUCCESS; -import static android.location.timezone.LocationTimeZoneEvent.EVENT_TYPE_UNCERTAIN; - +import static com.android.internal.location.timezone.LocationTimeZoneEvent.EVENT_TYPE_PERMANENT_FAILURE; +import static com.android.internal.location.timezone.LocationTimeZoneEvent.EVENT_TYPE_SUCCESS; +import static com.android.internal.location.timezone.LocationTimeZoneEvent.EVENT_TYPE_UNCERTAIN; import static com.android.server.location.timezone.LocationTimeZoneProvider.ProviderState.PROVIDER_STATE_DISABLED; import static com.android.server.location.timezone.LocationTimeZoneProvider.ProviderState.PROVIDER_STATE_ENABLED_CERTAIN; import static com.android.server.location.timezone.LocationTimeZoneProvider.ProviderState.PROVIDER_STATE_ENABLED_INITIALIZING; @@ -37,10 +36,10 @@ import static java.util.Arrays.asList; import android.annotation.NonNull; import android.annotation.Nullable; -import android.location.timezone.LocationTimeZoneEvent; import android.platform.test.annotations.Presubmit; import android.util.IndentingPrintWriter; +import com.android.internal.location.timezone.LocationTimeZoneEvent; import com.android.server.location.timezone.LocationTimeZoneProvider.ProviderState.ProviderStateEnum; import com.android.server.timezonedetector.ConfigurationInternal; import com.android.server.timezonedetector.GeolocationTimeZoneSuggestion; |