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

Commit 8558d93d authored by Neil Fuller's avatar Neil Fuller Committed by Gerrit Code Review
Browse files

Merge "Track move of distro installer code"

parents 9b43ffcf 5ca8b5bf

services/core/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ LOCAL_JAVA_LIBRARIES := \ 


LOCAL_STATIC_JAVA_LIBRARIES := \

    time_zone_distro \

    tzdata_update2 \

    time_zone_distro_installer \

    android.hidl.base-V1.0-java-static \

    android.hardware.tetheroffload.control-V1.0-java-static \

services/core/java/com/android/server/timezone/RulesManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import com.android.timezone.distro.DistroException; 
import com.android.timezone.distro.DistroVersion;

import com.android.timezone.distro.StagedDistroOperation;

import com.android.timezone.distro.TimeZoneDistro;

import com.android.timezone.distro.installer.TimeZoneDistroInstaller;



import android.app.timezone.Callback;

import android.app.timezone.DistroFormatVersion;
@@ -42,7 +43,6 @@ import java.io.InputStream; 
import java.util.Arrays;

import java.util.concurrent.Executor;

import java.util.concurrent.atomic.AtomicBoolean;

import libcore.tzdata.update2.TimeZoneDistroInstaller;



// TODO(nfuller) Add EventLog calls where useful in the system server.

// TODO(nfuller) Check logging best practices in the system server.

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

+1 −1
Original line number Diff line number Diff line
@@ -17,12 +17,12 @@ 
package com.android.server.updates;



import com.android.timezone.distro.TimeZoneDistro;

import com.android.timezone.distro.installer.TimeZoneDistroInstaller;



import android.util.Slog;



import java.io.File;

import java.io.IOException;

import libcore.tzdata.update2.TimeZoneDistroInstaller;



/**

 * An install receiver responsible for installing timezone data updates.

services/tests/servicestests/src/com/android/server/timezone/RulesManagerServiceTest.java

+1 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.server.timezone; 
import com.android.timezone.distro.DistroVersion;

import com.android.timezone.distro.StagedDistroOperation;

import com.android.timezone.distro.TimeZoneDistro;

import com.android.timezone.distro.installer.TimeZoneDistroInstaller;



import org.junit.Before;

import org.junit.Test;
@@ -35,7 +36,6 @@ import java.io.FileOutputStream; 
import java.io.IOException;

import java.util.concurrent.Executor;

import javax.annotation.Nullable;

import libcore.tzdata.update2.TimeZoneDistroInstaller;



import static com.android.server.timezone.RulesManagerService.REQUIRED_UPDATER_PERMISSION;

import static org.junit.Assert.assertEquals;