diff options
| author | vichang <vichang@google.com> | 2019-11-11 09:25:18 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-11-11 09:25:18 -0800 |
| commit | de6997d351f4363593be86ad856337f6c9c87a95 (patch) | |
| tree | aaa25f1eb1d5e90c74ae3c4faa163e661bdedcff | |
| parent | a9b90e91bf5781e8063628485fe4cb82fee92c0c (diff) | |
| parent | 819d8043bf30b178baeb9c86659f515ffdd92709 (diff) | |
| download | base-de6997d351f4363593be86ad856337f6c9c87a95.tar.gz | |
Merge "Obtain the ICU version from ICU4J instead of ICU4C" am: 552bd08fa5
am: 819d8043bf
Change-Id: I28d7a4098ae0b7aadaafc3eb5be9f14cbb5c4ae5
| -rw-r--r-- | services/core/java/com/android/server/timezone/RulesManagerService.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/timezone/RulesManagerService.java b/services/core/java/com/android/server/timezone/RulesManagerService.java index 28c171bdeb98..9347d2194b68 100644 --- a/services/core/java/com/android/server/timezone/RulesManagerService.java +++ b/services/core/java/com/android/server/timezone/RulesManagerService.java @@ -32,6 +32,7 @@ import android.app.timezone.IRulesManager; import android.app.timezone.RulesManager; import android.app.timezone.RulesState; import android.content.Context; +import android.icu.util.TimeZone; import android.os.ParcelFileDescriptor; import android.os.RemoteException; import android.util.Slog; @@ -45,7 +46,6 @@ import com.android.timezone.distro.StagedDistroOperation; import com.android.timezone.distro.TimeZoneDistro; import com.android.timezone.distro.installer.TimeZoneDistroInstaller; -import libcore.icu.ICU; import libcore.timezone.TimeZoneDataFiles; import libcore.timezone.TimeZoneFinder; import libcore.timezone.TzDataSetVersion; @@ -519,7 +519,7 @@ public final class RulesManagerService extends IRulesManager.Stub { // Report the active rules version (i.e. the rules in use by the current // process). pw.println("Active rules version (ICU, ZoneInfoDB, TimeZoneFinder): " - + ICU.getTZDataVersion() + "," + + TimeZone.getTZDataVersion() + "," + ZoneInfoDB.getInstance().getVersion() + "," + TimeZoneFinder.getInstance().getIanaVersion()); break; @@ -535,7 +535,7 @@ public final class RulesManagerService extends IRulesManager.Stub { pw.println("RulesManagerService state: " + toString()); pw.println("Active rules version (ICU, ZoneInfoDB, TimeZoneFinder): " - + ICU.getTZDataVersion() + "," + + TimeZone.getTZDataVersion() + "," + ZoneInfoDB.getInstance().getVersion() + "," + TimeZoneFinder.getInstance().getIanaVersion()); pw.println("Distro state: " + rulesState.toString()); |