diff options
| author | vichang <vichang@google.com> | 2020-11-04 13:34:08 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-11-04 13:34:08 +0000 |
| commit | bd61a3225effce5f864369de35158b032f68b1eb (patch) | |
| tree | ae4cce099e0abb6f0f9b00431523c78fb09f4709 /core/java/android/timezone/TzDataSetVersion.java | |
| parent | d81f5ef79b876cd71476c8b64ab6b3c0091ba85d (diff) | |
| parent | b295aad1bc9091b0f9d01eeb6542feac2f902fce (diff) | |
Merge "Add app compat config from ICU4J" am: 6d5fbc8434 am: cf0dc89869 am: 334b0811ac am: b295aad1bc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1481306
Change-Id: Ie64209ccda762c3c7ebabdeace1a34c16794c47d
Diffstat (limited to 'core/java/android/timezone/TzDataSetVersion.java')
| -rw-r--r-- | core/java/android/timezone/TzDataSetVersion.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/timezone/TzDataSetVersion.java b/core/java/android/timezone/TzDataSetVersion.java index edcbbb354089..4031ff8692de 100644 --- a/core/java/android/timezone/TzDataSetVersion.java +++ b/core/java/android/timezone/TzDataSetVersion.java @@ -19,6 +19,7 @@ package android.timezone; import android.annotation.NonNull; import android.annotation.Nullable; +import com.android.i18n.timezone.TimeZoneDataFiles; import com.android.internal.annotations.VisibleForTesting; import java.io.IOException; @@ -76,8 +77,7 @@ public final class TzDataSetVersion { @NonNull public static TzDataSetVersion read() throws IOException, TzDataSetException { try { - return new TzDataSetVersion( - com.android.i18n.timezone.TzDataSetVersion.readTimeZoneModuleVersion()); + return new TzDataSetVersion(TimeZoneDataFiles.readTimeZoneModuleVersion()); } catch (com.android.i18n.timezone.TzDataSetVersion.TzDataSetException e) { throw new TzDataSetException(e.getMessage(), e); } |