Some files in libcore/tzdata are moving to system/timezone
under the package com.android.timezone.distro.
To run tests:
make -j30 FrameworksServicesTests
adb install -r -g "out/target/product/angler/data/app/FrameworksServicesTests/FrameworksServicesTests.apk"
adb shell am instrument -e package com.android.server.timezone -w com.android.frameworks.servicestests \
"com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner"
Test: See above.
Bug:
31008728
Merged-In: I2600dd4bee22a571b9eb7303733591b60d1a8b2a
Change-Id: I2600dd4bee22a571b9eb7303733591b60d1a8b2a
android.hidl.manager-V1.0-java \
LOCAL_STATIC_JAVA_LIBRARIES := \
android.hidl.manager-V1.0-java \
LOCAL_STATIC_JAVA_LIBRARIES := \
tzdata_update2 \
android.hidl.base-V1.0-java-static \
android.hardware.tetheroffload.control-V1.0-java-static \
tzdata_update2 \
android.hidl.base-V1.0-java-static \
android.hardware.tetheroffload.control-V1.0-java-static \
import com.android.internal.annotations.VisibleForTesting;
import com.android.server.SystemService;
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;
import android.app.timezone.Callback;
import android.app.timezone.DistroFormatVersion;
import java.util.Arrays;
import java.util.concurrent.Executor;
import java.util.concurrent.atomic.AtomicBoolean;
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.
import libcore.tzdata.update2.TimeZoneDistroInstaller;
// TODO(nfuller) Add EventLog calls where useful in the system server.
package com.android.server.timezone;
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;
import org.junit.Before;
import org.junit.Test;
import java.io.IOException;
import java.util.concurrent.Executor;
import javax.annotation.Nullable;
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;
import libcore.tzdata.update2.TimeZoneDistroInstaller;
import static com.android.server.timezone.RulesManagerService.REQUIRED_UPDATER_PERMISSION;