diff options
| author | vichang <vichang@google.com> | 2020-11-04 12:28:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-11-04 12:28:57 +0000 |
| commit | 6d5fbc8434b3110993022a6f1ad99c605621f6a3 (patch) | |
| tree | 820ee2e4f320b6b2f84b3ed23f4e442d6077fa24 | |
| parent | 817969762e14919d8738653822d87a8f94cea6a6 (diff) | |
| parent | a4fae275d57ac2e343f9e8912061d50bdd326b17 (diff) | |
Merge "Add app compat config from ICU4J"
| -rw-r--r-- | Android.bp | 1 | ||||
| -rw-r--r-- | core/java/android/timezone/TzDataSetVersion.java | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp index 35879df4b852..9c33106799f0 100644 --- a/Android.bp +++ b/Android.bp @@ -554,6 +554,7 @@ java_library { "framework-platform-compat-config", // TODO: remove gps_debug and protolog.conf.json when the build system propagates "required" properly. "gps_debug.conf", + "icu4j-platform-compat-config", "libcore-platform-compat-config", "protolog.conf.json.gz", "services-platform-compat-config", diff --git a/core/java/android/timezone/TzDataSetVersion.java b/core/java/android/timezone/TzDataSetVersion.java index e1fb932b977d..52e1e58b2cfd 100644 --- a/core/java/android/timezone/TzDataSetVersion.java +++ b/core/java/android/timezone/TzDataSetVersion.java @@ -18,6 +18,7 @@ package android.timezone; import android.annotation.NonNull; +import com.android.i18n.timezone.TimeZoneDataFiles; import com.android.internal.annotations.VisibleForTesting; import java.io.IOException; @@ -75,8 +76,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); } |