diff options
| -rw-r--r-- | services/core/java/com/android/server/location/GeocoderProxy.java | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/location/HardwareActivityRecognitionProxy.java | 4 | ||||
| -rw-r--r-- | services/core/java/com/android/server/location/geofence/GeofenceProxy.java | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/location/provider/proxy/ProxyLocationProvider.java | 4 | ||||
| -rw-r--r-- | services/core/java/com/android/server/servicewatcher/ServiceWatcher.java (renamed from services/core/java/com/android/server/ServiceWatcher.java) | 3 | ||||
| -rw-r--r-- | services/core/java/com/android/server/timezonedetector/location/RealLocationTimeZoneProviderProxy.java | 4 |
6 files changed, 10 insertions, 9 deletions
diff --git a/services/core/java/com/android/server/location/GeocoderProxy.java b/services/core/java/com/android/server/location/GeocoderProxy.java index 3ac148ddab1b..c93c4b1f21b7 100644 --- a/services/core/java/com/android/server/location/GeocoderProxy.java +++ b/services/core/java/com/android/server/location/GeocoderProxy.java @@ -24,7 +24,7 @@ import android.location.IGeocodeProvider; import android.os.IBinder; import android.os.RemoteException; -import com.android.server.ServiceWatcher; +import com.android.server.servicewatcher.ServiceWatcher; import java.util.Collections; diff --git a/services/core/java/com/android/server/location/HardwareActivityRecognitionProxy.java b/services/core/java/com/android/server/location/HardwareActivityRecognitionProxy.java index 6ea4bd2b1d6d..e1c87000ea89 100644 --- a/services/core/java/com/android/server/location/HardwareActivityRecognitionProxy.java +++ b/services/core/java/com/android/server/location/HardwareActivityRecognitionProxy.java @@ -25,8 +25,8 @@ import android.os.IBinder; import android.os.RemoteException; import android.util.Log; -import com.android.server.ServiceWatcher; -import com.android.server.ServiceWatcher.BoundService; +import com.android.server.servicewatcher.ServiceWatcher; +import com.android.server.servicewatcher.ServiceWatcher.BoundService; /** * Proxy class to bind GmsCore to the ActivityRecognitionHardware. diff --git a/services/core/java/com/android/server/location/geofence/GeofenceProxy.java b/services/core/java/com/android/server/location/geofence/GeofenceProxy.java index bdfa6d7aa67e..c70714932792 100644 --- a/services/core/java/com/android/server/location/geofence/GeofenceProxy.java +++ b/services/core/java/com/android/server/location/geofence/GeofenceProxy.java @@ -29,7 +29,7 @@ import android.os.RemoteException; import android.os.UserHandle; import android.util.Log; -import com.android.server.ServiceWatcher; +import com.android.server.servicewatcher.ServiceWatcher; import java.util.Objects; diff --git a/services/core/java/com/android/server/location/provider/proxy/ProxyLocationProvider.java b/services/core/java/com/android/server/location/provider/proxy/ProxyLocationProvider.java index f00478a3488a..2c3fc2c84998 100644 --- a/services/core/java/com/android/server/location/provider/proxy/ProxyLocationProvider.java +++ b/services/core/java/com/android/server/location/provider/proxy/ProxyLocationProvider.java @@ -37,9 +37,9 @@ import android.util.ArraySet; import com.android.internal.annotations.GuardedBy; import com.android.internal.util.ArrayUtils; -import com.android.server.ServiceWatcher; -import com.android.server.ServiceWatcher.BoundService; import com.android.server.location.provider.AbstractLocationProvider; +import com.android.server.servicewatcher.ServiceWatcher; +import com.android.server.servicewatcher.ServiceWatcher.BoundService; import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/services/core/java/com/android/server/ServiceWatcher.java b/services/core/java/com/android/server/servicewatcher/ServiceWatcher.java index 8a2894c84cc4..5d49663209b7 100644 --- a/services/core/java/com/android/server/ServiceWatcher.java +++ b/services/core/java/com/android/server/servicewatcher/ServiceWatcher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.server; +package com.android.server.servicewatcher; import static android.content.Context.BIND_AUTO_CREATE; import static android.content.Context.BIND_NOT_FOREGROUND; @@ -52,6 +52,7 @@ import com.android.internal.annotations.Immutable; import com.android.internal.content.PackageMonitor; import com.android.internal.util.Preconditions; import com.android.internal.util.function.pooled.PooledLambda; +import com.android.server.FgThread; import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/services/core/java/com/android/server/timezonedetector/location/RealLocationTimeZoneProviderProxy.java b/services/core/java/com/android/server/timezonedetector/location/RealLocationTimeZoneProviderProxy.java index 531c62c5b4e9..0b51488280e0 100644 --- a/services/core/java/com/android/server/timezonedetector/location/RealLocationTimeZoneProviderProxy.java +++ b/services/core/java/com/android/server/timezonedetector/location/RealLocationTimeZoneProviderProxy.java @@ -39,8 +39,8 @@ import android.service.timezone.TimeZoneProviderSuggestion; import android.util.IndentingPrintWriter; import com.android.internal.annotations.GuardedBy; -import com.android.server.ServiceWatcher; -import com.android.server.ServiceWatcher.BoundService; +import com.android.server.servicewatcher.ServiceWatcher; +import com.android.server.servicewatcher.ServiceWatcher.BoundService; import java.util.Objects; import java.util.function.Predicate; |