Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "TimeZoneBundleInstaller -> TimeZoneDistroInstaller"

Browse Source 
am: eb82e3de87

Change-Id: I7666ae9c9472f11cafe0df5a2f259df1c499d44b
This commit is contained in:
Neil Fuller
2017-02-16 16:02:33 +00:00
committed by android-build-merger
parent ede9f94e32 eb82e3de87
commit c1867dedfa
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/updates/TzDataInstallReceiver.java
View File

@@ -20,7 +20,7 @@ import android.util.Slog;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import libcore.tzdata.update2.TimeZoneBundleInstaller; import libcore.tzdata.update2.TimeZoneDistroInstaller;
/** /**
* An install receiver responsible for installing timezone data updates. * 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_DIR_NAME = TZ_DATA_DIR.getPath() + "/updates/";
private static final String UPDATE_METADATA_DIR_NAME = "metadata/"; private static final String UPDATE_METADATA_DIR_NAME = "metadata/";
private static final String UPDATE_VERSION_FILE_NAME = "version"; 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() { public TzDataInstallReceiver() {
super(UPDATE_DIR_NAME, UPDATE_CONTENT_FILE_NAME, UPDATE_METADATA_DIR_NAME, super(UPDATE_DIR_NAME, UPDATE_CONTENT_FILE_NAME, UPDATE_METADATA_DIR_NAME,
UPDATE_VERSION_FILE_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 @Override