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

Commit fb46f6a0 authored by Neil Fuller's avatar Neil Fuller Committed by android-build-merger
Browse files

Merge "Track move of distro installer code" am: 8558d93d 

am: 50a15e7f

Change-Id: I5295f6e63ac9aafbebaa9870776e0502bf5129d7
parents a8bccb66 50a15e7f

services/core/Android.mk

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




LOCAL_STATIC_JAVA_LIBRARIES := \

LOCAL_STATIC_JAVA_LIBRARIES := \

    time_zone_distro \

    time_zone_distro \

    tzdata_update2 \

    time_zone_distro_installer \

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

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

    android.hardware.biometrics.fingerprint-V2.1-java-static \

    android.hardware.biometrics.fingerprint-V2.1-java-static \

    android.hardware.tetheroffload.control-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 Original line 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.DistroVersion;

import com.android.timezone.distro.StagedDistroOperation;

import com.android.timezone.distro.StagedDistroOperation;

import com.android.timezone.distro.TimeZoneDistro;

import com.android.timezone.distro.TimeZoneDistro;

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





import android.app.timezone.Callback;

import android.app.timezone.Callback;

import android.app.timezone.DistroFormatVersion;

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

import java.util.Arrays;

import java.util.concurrent.Executor;

import java.util.concurrent.Executor;

import java.util.concurrent.atomic.AtomicBoolean;

import java.util.concurrent.atomic.AtomicBoolean;

import libcore.tzdata.update2.TimeZoneDistroInstaller;





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

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

// TODO(nfuller) Check logging best practices 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 Original line Diff line number Diff line
@@ -17,12 +17,12 @@ 
package com.android.server.updates;

package com.android.server.updates;





import com.android.timezone.distro.TimeZoneDistro;

import com.android.timezone.distro.TimeZoneDistro;

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





import android.util.Slog;

import android.util.Slog;





import java.io.File;

import java.io.File;

import java.io.IOException;

import java.io.IOException;

import libcore.tzdata.update2.TimeZoneDistroInstaller;





/**

/**

 * An install receiver responsible for installing timezone data updates.

 * An install receiver responsible for installing timezone data updates.

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

+1 −1
Original line number Original line 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.DistroVersion;

import com.android.timezone.distro.StagedDistroOperation;

import com.android.timezone.distro.StagedDistroOperation;

import com.android.timezone.distro.TimeZoneDistro;

import com.android.timezone.distro.TimeZoneDistro;

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





import org.junit.Before;

import org.junit.Before;

import org.junit.Test;

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

import java.io.IOException;

import java.util.concurrent.Executor;

import java.util.concurrent.Executor;

import javax.annotation.Nullable;

import javax.annotation.Nullable;

import libcore.tzdata.update2.TimeZoneDistroInstaller;





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

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

import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertEquals;