summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Neil Fuller <nfuller@google.com> 2017-02-10 17:57:50 +0000
committer Neil Fuller <nfuller@google.com> 2017-02-10 18:03:08 +0000
commit2b653dcc632d428e890d83b27a11f9a591f04b05 (patch)
treeda1a31eb8a5aed034f8d16268ab48344b3511afc
parent8fbf6a29d088067bc8426a546854f9868efa2d6f (diff)
TimeZoneBundleInstaller -> TimeZoneDistroInstaller
Rename TimeZoneBundleInstaller to TimeZoneDistroInstaller to avoid the term "Bundle". Bug: 31008728 Test: make droid Change-Id: Ib2408495e0a3e011ac544aa87c622878421453e9
-rw-r--r--services/core/java/com/android/server/updates/TzDataInstallReceiver.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/updates/TzDataInstallReceiver.java b/services/core/java/com/android/server/updates/TzDataInstallReceiver.java
index b704eb1d991c..3c73c88b4f5c 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.update2.TimeZoneBundleInstaller;
+import libcore.tzdata.update2.TimeZoneDistroInstaller;
/**
* An install receiver responsible for installing timezone data updates.
@@ -34,14 +34,14 @@ public class TzDataInstallReceiver extends ConfigUpdateInstallReceiver {
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 static final String UPDATE_CONTENT_FILE_NAME = "tzdata_distro.zip";
- private final TimeZoneBundleInstaller installer;
+ private final TimeZoneDistroInstaller installer;
public TzDataInstallReceiver() {
super(UPDATE_DIR_NAME, UPDATE_CONTENT_FILE_NAME, UPDATE_METADATA_DIR_NAME,
UPDATE_VERSION_FILE_NAME);
- installer = new TimeZoneBundleInstaller(TAG, SYSTEM_TZ_DATA_FILE, TZ_DATA_DIR);
+ installer = new TimeZoneDistroInstaller(TAG, SYSTEM_TZ_DATA_FILE, TZ_DATA_DIR);
}
@Override