diff options
3 files changed, 7 insertions, 6 deletions
diff --git a/services/core/Android.mk b/services/core/Android.mk index f9b0d2f05c94..5e5c69d3ecfb 100644 --- a/services/core/Android.mk +++ b/services/core/Android.mk @@ -25,7 +25,7 @@ LOCAL_JAVA_LIBRARIES := \ android.hidl.manager-V1.0-java \ LOCAL_STATIC_JAVA_LIBRARIES := \ - tzdata_shared2 \ + time_zone_distro \ tzdata_update2 \ 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 82bd35679b04..bbb77826a4e0 100644 --- a/services/core/java/com/android/server/timezone/RulesManagerService.java +++ b/services/core/java/com/android/server/timezone/RulesManagerService.java @@ -18,6 +18,9 @@ package com.android.server.timezone; import com.android.internal.annotations.VisibleForTesting; import com.android.server.SystemService; +import com.android.timezone.distro.DistroException; +import com.android.timezone.distro.DistroVersion; +import com.android.timezone.distro.StagedDistroOperation; import android.app.timezone.Callback; import android.app.timezone.DistroFormatVersion; @@ -36,9 +39,6 @@ import java.io.IOException; import java.util.Arrays; import java.util.concurrent.Executor; import java.util.concurrent.atomic.AtomicBoolean; -import libcore.tzdata.shared2.DistroException; -import libcore.tzdata.shared2.DistroVersion; -import libcore.tzdata.shared2.StagedDistroOperation; import libcore.tzdata.update2.TimeZoneDistroInstaller; // TODO(nfuller) Add EventLog calls where useful in the system server. 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 a7f4c9947482..b6983fa58f8f 100644 --- a/services/tests/servicestests/src/com/android/server/timezone/RulesManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/timezone/RulesManagerServiceTest.java @@ -16,6 +16,9 @@ package com.android.server.timezone; +import com.android.timezone.distro.DistroVersion; +import com.android.timezone.distro.StagedDistroOperation; + import org.junit.Before; import org.junit.Test; @@ -29,8 +32,6 @@ import android.os.ParcelFileDescriptor; import java.io.IOException; import java.util.concurrent.Executor; import javax.annotation.Nullable; -import libcore.tzdata.shared2.DistroVersion; -import libcore.tzdata.shared2.StagedDistroOperation; import libcore.tzdata.update2.TimeZoneDistroInstaller; import static com.android.server.timezone.RulesManagerService.REQUIRED_UPDATER_PERMISSION; |