commit 4f5f211f72f167afd177b9fcddf051daf1669775
author Neil Fuller <nfuller@google.com> Thu Feb 16 16:09:10 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Feb 16 16:09:10 2017 +0000
tree 2edaa78ffb4f0746c17e4f46913c90e4c8a1ea85
parent c3f0f5f3dea016f220f2b83af12658a794deca22
parent c1867dedfa56e524a9dda637fd229d78dcca2513

Merge "TimeZoneBundleInstaller -> TimeZoneDistroInstaller" am: eb82e3de87
am: c1867dedfa

Change-Id: If2f639d07a44861b96b4497cc3dc02364dc85c51

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 b704eb1..3c73c88 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 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 @@
     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