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

Merge "Track movement of some libcore/tzdata files"

Browse Source 
am: 2ed8b06173

Change-Id: Icfe3e6bb1e0d19be462fb47c23cba1cf77c6bf20
This commit is contained in:
Neil Fuller
2017-06-16 14:51:10 +00:00
committed by android-build-merger
parent eeb0b31afa 2ed8b06173
commit de45dab9ed
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/Android.mk
View File

@@ -25,7 +25,7 @@ LOCAL_JAVA_LIBRARIES := \
android.hidl.manager-V1.0-java \
LOCAL_STATIC_JAVA_LIBRARIES := \
tzdata_shared2 \
time_zone_distro \
tzdata_update2 \
android.hidl.base-V1.0-java-static \
android.hardware.tetheroffload.control-V1.0-java-static \

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

@@ -18,6 +18,9 @@ package com.android.server.timezone;
import com.android.internal.annotations.VisibleForTesting;
import com.android.server.SystemService;
import com.android.timezone.distro.DistroException;
import com.android.timezone.distro.DistroVersion;
import com.android.timezone.distro.StagedDistroOperation;
import android.app.timezone.Callback;
import android.app.timezone.DistroFormatVersion;
@@ -36,9 +39,6 @@ import java.io.IOException;
import java.util.Arrays;
import java.util.concurrent.Executor;
import java.util.concurrent.atomic.AtomicBoolean;
import libcore.tzdata.shared2.DistroException;
import libcore.tzdata.shared2.DistroVersion;
import libcore.tzdata.shared2.StagedDistroOperation;
import libcore.tzdata.update2.TimeZoneDistroInstaller;
// TODO(nfuller) Add EventLog calls where useful in the system server.

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

@@ -16,6 +16,9 @@
package com.android.server.timezone;
import com.android.timezone.distro.DistroVersion;
import com.android.timezone.distro.StagedDistroOperation;
import org.junit.Before;
import org.junit.Test;
@@ -29,8 +32,6 @@ import android.os.ParcelFileDescriptor;
import java.io.IOException;
import java.util.concurrent.Executor;
import javax.annotation.Nullable;
import libcore.tzdata.shared2.DistroVersion;
import libcore.tzdata.shared2.StagedDistroOperation;
import libcore.tzdata.update2.TimeZoneDistroInstaller;
import static com.android.server.timezone.RulesManagerService.REQUIRED_UPDATER_PERMISSION;