diff options
| author | 2017-01-11 16:15:13 +0000 | |
|---|---|---|
| committer | 2017-01-11 16:15:13 +0000 | |
| commit | 505d8262ab8702fea19c926bdff4d66bbbaa766a (patch) | |
| tree | 49b38da2ff1386ea372da236cef77ade668449cc | |
| parent | 2d75264011f384d960a0a08d79fabb50bb84d9cd (diff) | |
| parent | 46c39f6c3640dabc3e5eb5d37460f0b3d0622da6 (diff) | |
resolve merge conflicts of 46c39f6c3640 to master
Change-Id: Ica5ee627b6884800ad3be172f5d2d10b6ba02052
| -rw-r--r-- | services/core/Android.mk | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/updates/TzDataInstallReceiver.java | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/services/core/Android.mk b/services/core/Android.mk index efadbefa417a..1366b3b2d694 100644 --- a/services/core/Android.mk +++ b/services/core/Android.mk @@ -24,7 +24,7 @@ LOCAL_JAVA_LIBRARIES := \ android.hardware.power@1.0-java \ android.hardware.tv.cec@1.0-java -LOCAL_STATIC_JAVA_LIBRARIES := tzdata_update +LOCAL_STATIC_JAVA_LIBRARIES := tzdata_update2 ifneq ($(INCREMENTAL_BUILDS),) LOCAL_PROGUARD_ENABLED := disabled diff --git a/services/core/java/com/android/server/updates/TzDataInstallReceiver.java b/services/core/java/com/android/server/updates/TzDataInstallReceiver.java index b260e4e2fc34..b704eb1d991c 100644 --- a/services/core/java/com/android/server/updates/TzDataInstallReceiver.java +++ b/services/core/java/com/android/server/updates/TzDataInstallReceiver.java @@ -20,7 +20,7 @@ import android.util.Slog; import java.io.File; import java.io.IOException; -import libcore.tzdata.update.TzDataBundleInstaller; +import libcore.tzdata.update2.TimeZoneBundleInstaller; /** * An install receiver responsible for installing timezone data updates. @@ -29,18 +29,19 @@ public class TzDataInstallReceiver extends ConfigUpdateInstallReceiver { private static final String TAG = "TZDataInstallReceiver"; + private static final File SYSTEM_TZ_DATA_FILE = new File("/system/usr/share/zoneinfo/tzdata"); private static final File TZ_DATA_DIR = new File("/data/misc/zoneinfo"); private static final String UPDATE_DIR_NAME = TZ_DATA_DIR.getPath() + "/updates/"; private static final String UPDATE_METADATA_DIR_NAME = "metadata/"; private static final String UPDATE_VERSION_FILE_NAME = "version"; private static final String UPDATE_CONTENT_FILE_NAME = "tzdata_bundle.zip"; - private final TzDataBundleInstaller installer; + private final TimeZoneBundleInstaller installer; public TzDataInstallReceiver() { super(UPDATE_DIR_NAME, UPDATE_CONTENT_FILE_NAME, UPDATE_METADATA_DIR_NAME, UPDATE_VERSION_FILE_NAME); - installer = new TzDataBundleInstaller(TAG, TZ_DATA_DIR); + installer = new TimeZoneBundleInstaller(TAG, SYSTEM_TZ_DATA_FILE, TZ_DATA_DIR); } @Override |