Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 505d8262 authored by Neil Fuller's avatar Neil Fuller
Browse files

resolve merge conflicts of 46c39f6c to master 

Change-Id: Ica5ee627b6884800ad3be172f5d2d10b6ba02052
parents 2d752640 46c39f6c

services/core/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -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

services/core/java/com/android/server/updates/TzDataInstallReceiver.java

+4 −3
Original line number Diff line number Diff line
@@ -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