Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add app compat config from ICU4J" am: 6d5fbc8434 am: cf0dc89869 am: 334b0811ac am: b295aad1bc

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1481306

Change-Id: Ie64209ccda762c3c7ebabdeace1a34c16794c47d
This commit is contained in:
vichang
2020-11-04 13:34:08 +00:00
committed by Automerger Merge Worker
parent d81f5ef79b b295aad1bc
commit bd61a3225e
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/timezone/TzDataSetVersion.java
View File

@@ -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);
}