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

Commit 69ffbd67 authored by Neil Fuller's avatar Neil Fuller
Browse files

Track move of timezone classes to libcore.timezone 

Some time zone related libcore classes are moving from
libcore.util to libcore.timezone.

Bug: 119026403
Test: build only
Exempt-From-Owner-Approval: Trivial import change
Merged-In: Ie90c219799cbf9601a22a2d972c09e3d94fc0c43
Change-Id: Ie90c219799cbf9601a22a2d972c09e3d94fc0c43
(cherry picked from commit 164394db)
parent cc37384e

core/java/android/util/TimeUtils.java

+3 −3
Original line number Diff line number Diff line
@@ -21,9 +21,9 @@ import android.annotation.Nullable; 
import android.annotation.UnsupportedAppUsage;

import android.os.SystemClock;



import libcore.util.CountryTimeZones;

import libcore.util.CountryTimeZones.TimeZoneMapping;

import libcore.util.TimeZoneFinder;

import libcore.timezone.CountryTimeZones;

import libcore.timezone.CountryTimeZones.TimeZoneMapping;

import libcore.timezone.TimeZoneFinder;

import libcore.util.ZoneInfoDB;



import java.io.PrintWriter;

packages/SettingsLib/src/com/android/settingslib/datetime/ZoneGetter.java

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ import android.view.View; 


import com.android.settingslib.R;



import libcore.util.TimeZoneFinder;

import libcore.timezone.TimeZoneFinder;



import org.xmlpull.v1.XmlPullParserException;

services/core/java/com/android/server/timezone/RulesManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ import java.util.concurrent.Executor; 
import java.util.concurrent.atomic.AtomicBoolean;

import libcore.icu.ICU;

import libcore.timezone.TzDataSetVersion;

import libcore.util.TimeZoneFinder;

import libcore.timezone.TimeZoneFinder;

import libcore.util.ZoneInfoDB;



import static android.app.timezone.RulesState.DISTRO_STATUS_INSTALLED;