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

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

Browse Source 
am: 03b89cdfb3

Change-Id: I831b29b0da995aca9c6e16d328f49d7771dd10db
This commit is contained in:
Neil Fuller
2017-02-16 16:20:41 +00:00
committed by android-build-merger
parent 387f45d78f 03b89cdfb3
commit 04c959a3d0
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.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