commit a4fae275d57ac2e343f9e8912061d50bdd326b17
author Victor Chang <vichang@google.com> Fri Oct 30 12:14:34 2020 +0000
committer Victor Chang <vichang@google.com> Fri Oct 30 12:14:34 2020 +0000
tree f8955d99806501b1b30e660d44cf8e8f99ad440d
parent 33f7bff2ea7695390bcef62fca753202a4ed82d4

Add app compat config from ICU4J

Bug: 139480281
Bug: 171979766
Test: device boots
Change-Id: Ib2065368e2c5e0904c229c9383bc774269a0f410

Android.bp

diff --git a/Android.bp b/Android.bp
index 87b7dc1..b6c03ec 100644
--- a/Android.bp
+++ b/Android.bp
@@ -554,6 +554,7 @@
         "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",

core/java/android/timezone/TzDataSetVersion.java

diff --git a/core/java/android/timezone/TzDataSetVersion.java b/core/java/android/timezone/TzDataSetVersion.java
index e1fb932..52e1e58 100644
--- a/core/java/android/timezone/TzDataSetVersion.java
+++ b/core/java/android/timezone/TzDataSetVersion.java
@@ -18,6 +18,7 @@
 
 import android.annotation.NonNull;
 
+import com.android.i18n.timezone.TimeZoneDataFiles;
 import com.android.internal.annotations.VisibleForTesting;
 
 import java.io.IOException;
@@ -75,8 +76,7 @@
     @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);
         }