Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd61a322 authored by vichang's avatar vichang Committed by Automerger Merge Worker
Browse files

Merge "Add app compat config from ICU4J" am: 6d5fbc84 am: cf0dc898 am:... 

Merge "Add app compat config from ICU4J" am: 6d5fbc84 am: cf0dc898 am: 334b0811 am: b295aad1

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

Change-Id: Ie64209ccda762c3c7ebabdeace1a34c16794c47d
parents d81f5ef7 b295aad1

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -596,6 +596,7 @@ java_defaults { 
        "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

+2 −2
Original line number Diff line number Diff line
@@ -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);

        }