From bd141410569862886727310ced9dee378f4bdf94 Mon Sep 17 00:00:00 2001 From: Neil Fuller Date: Tue, 24 Nov 2020 13:54:14 +0000 Subject: [PATCH] Move LocationTimeZoneEvent to com.android LocationTimeZoneEvent was originally supposed to fulfil the same role as Location does in the LocationProvider. Since Location is public SDK, it was in android.location. LocationTimeZoneEvent is not public SDK (or any form of API), so it can be moved to com.android instead. LocationTimeZoneEventUnbundled is in the API in its place. Bug: 169304499 Test: treehugger only Change-Id: I5d382362383000b16852928895a18ac4e4269a8f --- .../timezone/ILocationTimeZoneProviderManager.aidl | 2 +- .../location/timezone/LocationTimeZoneEvent.aidl | 2 +- .../location/timezone/LocationTimeZoneEvent.java | 2 +- .../provider/LocationTimeZoneEventUnbundled.java | 3 ++- .../timezone/BinderLocationTimeZoneProvider.java | 2 +- .../server/location/timezone/ControllerImpl.java | 9 ++++----- .../timezone/LocationTimeZoneManagerService.java | 2 +- .../location/timezone/LocationTimeZoneProvider.java | 9 ++++----- .../timezone/LocationTimeZoneProviderProxy.java | 2 +- .../timezone/NullLocationTimeZoneProvider.java | 4 ++-- .../timezone/RealLocationTimeZoneProviderProxy.java | 2 +- .../timezone/SimulatedBinderProviderEvent.java | 10 +++++----- .../location/timezone/LocationTimeZoneEventTest.java | 4 ++-- .../timezone/LocationTimeZoneProviderRequestTest.java | 2 +- .../location/timezone/ParcelableTestSupport.java | 4 ++-- .../server/location/timezone/ControllerImplTest.java | 9 ++++----- 16 files changed, 33 insertions(+), 35 deletions(-) rename location/java/{android => com/android/internal}/location/timezone/LocationTimeZoneEvent.aidl (93%) rename location/java/{android => com/android/internal}/location/timezone/LocationTimeZoneEvent.java (99%) rename services/tests/servicestests/src/{android => com/android/internal}/location/timezone/LocationTimeZoneEventTest.java (97%) rename services/tests/servicestests/src/{android => com/android/internal}/location/timezone/ParcelableTestSupport.java (95%) diff --git a/location/java/com/android/internal/location/timezone/ILocationTimeZoneProviderManager.aidl b/location/java/com/android/internal/location/timezone/ILocationTimeZoneProviderManager.aidl index f89a64fc586cc..b5450b7a0f886 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 similarity index 93% rename from location/java/android/location/timezone/LocationTimeZoneEvent.aidl rename to location/java/com/android/internal/location/timezone/LocationTimeZoneEvent.aidl index 5386588229301..199e0671f9100 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 similarity index 99% rename from location/java/android/location/timezone/LocationTimeZoneEvent.java rename to location/java/com/android/internal/location/timezone/LocationTimeZoneEvent.java index 922a38921048c..7eb843e93e68d 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 07396333b05c8..d044c0b529394 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 280d59af7d2a2..b4bcd7b10c42b 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 70c1aeff0ce8b..07615ff580750 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 83f4ca2839fb3..b7c7476844a51 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. * *

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 4bbda43d0e606..dc56238e2f488 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 3d889ae1856ad..1b4706f8801ea 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 2bbae56e40c88..fbcc71fad20a7 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 94062faa7a1b8..cd6d3592af0ed 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 6bf6539f95dcb..9d262e33274bb 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 similarity index 97% rename from services/tests/servicestests/src/android/location/timezone/LocationTimeZoneEventTest.java rename to services/tests/servicestests/src/com/android/internal/location/timezone/LocationTimeZoneEventTest.java index 80373ac661098..9efb38a75f358 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 75696dac3b44d..95daa36f2c404 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 similarity index 95% rename from services/tests/servicestests/src/android/location/timezone/ParcelableTestSupport.java rename to services/tests/servicestests/src/com/android/internal/location/timezone/ParcelableTestSupport.java index 316a2e65fb308..ece5d004975de 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 c4b19e84bccb6..3f1653718fe73 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;