From a4fae275d57ac2e343f9e8912061d50bdd326b17 Mon Sep 17 00:00:00 2001
From: Victor Chang <vichang@google.com>
Date: Fri, 30 Oct 2020 12:14:34 +0000
Subject: [PATCH] Add app compat config from ICU4J

Bug: 139480281
Bug: 171979766
Test: device boots
Change-Id: Ib2065368e2c5e0904c229c9383bc774269a0f410
---
 Android.bp                                       | 1 +
 core/java/android/timezone/TzDataSetVersion.java | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Android.bp b/Android.bp
index 87b7dc10d31aa..b6c03ec5b0af9 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 e1fb932b977d3..52e1e58b2cfd7 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);
         }