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

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

Change-Id: I155c8b08527e28efabef100c7105210b84ddbeec
This commit is contained in:
vichang
2020-11-04 12:32:26 +00:00
committed by Automerger Merge Worker
parent b0c59d4b6b 6d5fbc8434
commit cf0dc89869
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Android.bp
View File

@@ -554,6 +554,7 @@ java_library {
"framework-platform-compat-config", "framework-platform-compat-config",
// TODO: remove gps_debug and protolog.conf.json when the build system propagates "required" properly. // TODO: remove gps_debug and protolog.conf.json when the build system propagates "required" properly.
"gps_debug.conf", "gps_debug.conf",
"icu4j-platform-compat-config",
"libcore-platform-compat-config", "libcore-platform-compat-config",
"protolog.conf.json.gz", "protolog.conf.json.gz",
"services-platform-compat-config", "services-platform-compat-config",

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

@@ -18,6 +18,7 @@ package android.timezone;
import android.annotation.NonNull; import android.annotation.NonNull;
import com.android.i18n.timezone.TimeZoneDataFiles;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
import java.io.IOException; import java.io.IOException;
@@ -75,8 +76,7 @@ public final class TzDataSetVersion {
@NonNull @NonNull
public static TzDataSetVersion read() throws IOException, TzDataSetException { public static TzDataSetVersion read() throws IOException, TzDataSetException {
try { try {
return new TzDataSetVersion( return new TzDataSetVersion(TimeZoneDataFiles.readTimeZoneModuleVersion());
com.android.i18n.timezone.TzDataSetVersion.readTimeZoneModuleVersion());
} catch (com.android.i18n.timezone.TzDataSetVersion.TzDataSetException e) { } catch (com.android.i18n.timezone.TzDataSetVersion.TzDataSetException e) {
throw new TzDataSetException(e.getMessage(), e); throw new TzDataSetException(e.getMessage(), e);
} }