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

Commit 8e81a7c8 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Track movement of some libcore/tzdata files am: 3b5ae1e6" into oc-dr1-dev-plus-aosp

parents 9ce029c3 5919d8a1
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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.weaver-V1.0-java-static \
+3 −3
Original line number Diff line number Diff line
@@ -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.
+3 −2
Original line number Diff line number Diff line
@@ -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;