diff options
4 files changed, 4 insertions, 4 deletions
diff --git a/services/core/Android.mk b/services/core/Android.mk index 5e5c69d3ecfb..bc973304dd2c 100644 --- a/services/core/Android.mk +++ b/services/core/Android.mk @@ -26,7 +26,7 @@ LOCAL_JAVA_LIBRARIES := \ LOCAL_STATIC_JAVA_LIBRARIES := \ time_zone_distro \ - tzdata_update2 \ + time_zone_distro_installer \ android.hidl.base-V1.0-java-static \ android.hardware.tetheroffload.control-V1.0-java-static \ diff --git a/services/core/java/com/android/server/timezone/RulesManagerService.java b/services/core/java/com/android/server/timezone/RulesManagerService.java index 804a8b79310e..5724398210e4 100644 --- a/services/core/java/com/android/server/timezone/RulesManagerService.java +++ b/services/core/java/com/android/server/timezone/RulesManagerService.java @@ -22,6 +22,7 @@ import com.android.timezone.distro.DistroException; import com.android.timezone.distro.DistroVersion; import com.android.timezone.distro.StagedDistroOperation; import com.android.timezone.distro.TimeZoneDistro; +import com.android.timezone.distro.installer.TimeZoneDistroInstaller; import android.app.timezone.Callback; import android.app.timezone.DistroFormatVersion; @@ -42,7 +43,6 @@ import java.io.InputStream; import java.util.Arrays; import java.util.concurrent.Executor; import java.util.concurrent.atomic.AtomicBoolean; -import libcore.tzdata.update2.TimeZoneDistroInstaller; // TODO(nfuller) Add EventLog calls where useful in the system server. // TODO(nfuller) Check logging best practices in the system server. diff --git a/services/core/java/com/android/server/updates/TzDataInstallReceiver.java b/services/core/java/com/android/server/updates/TzDataInstallReceiver.java index 2be69ac68219..cabce183a1a4 100644 --- a/services/core/java/com/android/server/updates/TzDataInstallReceiver.java +++ b/services/core/java/com/android/server/updates/TzDataInstallReceiver.java @@ -17,12 +17,12 @@ package com.android.server.updates; import com.android.timezone.distro.TimeZoneDistro; +import com.android.timezone.distro.installer.TimeZoneDistroInstaller; import android.util.Slog; import java.io.File; import java.io.IOException; -import libcore.tzdata.update2.TimeZoneDistroInstaller; /** * An install receiver responsible for installing timezone data updates. diff --git a/services/tests/servicestests/src/com/android/server/timezone/RulesManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/timezone/RulesManagerServiceTest.java index 3b76d5e05e0e..1407e2649d59 100644 --- a/services/tests/servicestests/src/com/android/server/timezone/RulesManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/timezone/RulesManagerServiceTest.java @@ -19,6 +19,7 @@ package com.android.server.timezone; import com.android.timezone.distro.DistroVersion; import com.android.timezone.distro.StagedDistroOperation; import com.android.timezone.distro.TimeZoneDistro; +import com.android.timezone.distro.installer.TimeZoneDistroInstaller; import org.junit.Before; import org.junit.Test; @@ -35,7 +36,6 @@ import java.io.FileOutputStream; import java.io.IOException; import java.util.concurrent.Executor; import javax.annotation.Nullable; -import libcore.tzdata.update2.TimeZoneDistroInstaller; import static com.android.server.timezone.RulesManagerService.REQUIRED_UPDATER_PERMISSION; import static org.junit.Assert.assertEquals; |