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

Merge "Track move of distro installer code" am: 8558d93db8 am: 50a15e7f6e

Browse Source 
am: fb46f6a0b8

Change-Id: I398b9b48447835bc86816187ed5bab4233dcf6e1
This commit is contained in:
Neil Fuller
2017-06-30 12:52:21 +00:00
committed by android-build-merger
parent 9b93eb0263 fb46f6a0b8
commit aff8468e2d
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/Android.mk
View File

@@ -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.weaver-V1.0-java-static \ android.hardware.weaver-V1.0-java-static \
android.hardware.biometrics.fingerprint-V2.1-java-static \ android.hardware.biometrics.fingerprint-V2.1-java-static \

2
services/core/java/com/android/server/timezone/RulesManagerService.java
View File

@@ -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.

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

@@ -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.

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

@@ -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;