commit 37f5f54ebe064bac71e5fb17e3e13b5d25fd435c
author Neil Fuller <nfuller@google.com> Fri Jun 30 13:00:55 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jun 30 13:00:55 2017 +0000
tree 0d33911dd0179cb62bc2b2fd82d3195893c72df6
parent 3729ab8b3870c89e1d095f44f975ff1082ed057a
parent aff8468e2df0e563020f677eb4f8b414d7918028

Merge "Track move of distro installer code" am: 8558d93db8 am: 50a15e7f6e am: fb46f6a0b8
am: aff8468e2d

Change-Id: I651b8987cc3f3cc0cca263c8c6b73c43a61fdd57

services/core/Android.mk

diff --git a/services/core/Android.mk b/services/core/Android.mk
index 3ec78f4..c90b402 100644
--- a/services/core/Android.mk
+++ b/services/core/Android.mk
@@ -26,7 +26,7 @@
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
     time_zone_distro \
-    tzdata_update2 \
+    time_zone_distro_installer \
     android.hidl.base-V1.0-java-static \
     android.hardware.weaver-V1.0-java-static \
     android.hardware.biometrics.fingerprint-V2.1-java-static \

services/core/java/com/android/server/timezone/RulesManagerService.java

diff --git a/services/core/java/com/android/server/timezone/RulesManagerService.java b/services/core/java/com/android/server/timezone/RulesManagerService.java
index 804a8b7..5724398 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.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.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.

services/core/java/com/android/server/updates/TzDataInstallReceiver.java

diff --git a/services/core/java/com/android/server/updates/TzDataInstallReceiver.java b/services/core/java/com/android/server/updates/TzDataInstallReceiver.java
index 2be69ac..cabce18 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.

services/tests/servicestests/src/com/android/server/timezone/RulesManagerServiceTest.java

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 3b76d5e..1407e26 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 @@
 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.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;