summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Tobias Thierer <tobiast@google.com> 2017-02-13 19:19:43 +0000
committer Tobias Thierer <tobiast@google.com> 2017-03-01 16:48:21 +0000
commita6a2f5a1749c501eb645c70d25dd71fc24189e12 (patch)
treef51dbb4db94322da31f6597a010a4e56ce927af7
parent924878a75258c02ab006d8e30a2dc09974e546e4 (diff)
Track: ICU TimeZone: publish TIMEZONE_* constants
These are necessary to use the ICU TimeZone.getTimeZone(String, int) API that was published in Android N. Test: make update-api Bug: 29318728 Change-Id: I078fb1cb93718b6e784f1de071b6f58f3abb7365
-rw-r--r--api/current.txt2
-rw-r--r--api/system-current.txt2
-rw-r--r--api/test-current.txt2
3 files changed, 6 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 5555d1fee777..b427d662ed96 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -18724,6 +18724,8 @@ package android.icu.util {
field public static final int SHORT_COMMONLY_USED = 6; // 0x6
field public static final int SHORT_GENERIC = 2; // 0x2
field public static final int SHORT_GMT = 4; // 0x4
+ field public static final int TIMEZONE_ICU = 0; // 0x0
+ field public static final int TIMEZONE_JDK = 1; // 0x1
field public static final android.icu.util.TimeZone UNKNOWN_ZONE;
field public static final java.lang.String UNKNOWN_ZONE_ID = "Etc/Unknown";
}
diff --git a/api/system-current.txt b/api/system-current.txt
index 701c86ffef56..07ddb7b4480c 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -19938,6 +19938,8 @@ package android.icu.util {
field public static final int SHORT_COMMONLY_USED = 6; // 0x6
field public static final int SHORT_GENERIC = 2; // 0x2
field public static final int SHORT_GMT = 4; // 0x4
+ field public static final int TIMEZONE_ICU = 0; // 0x0
+ field public static final int TIMEZONE_JDK = 1; // 0x1
field public static final android.icu.util.TimeZone UNKNOWN_ZONE;
field public static final java.lang.String UNKNOWN_ZONE_ID = "Etc/Unknown";
}
diff --git a/api/test-current.txt b/api/test-current.txt
index 1979667d8cdd..c0c5c795237a 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -18741,6 +18741,8 @@ package android.icu.util {
field public static final int SHORT_COMMONLY_USED = 6; // 0x6
field public static final int SHORT_GENERIC = 2; // 0x2
field public static final int SHORT_GMT = 4; // 0x4
+ field public static final int TIMEZONE_ICU = 0; // 0x0
+ field public static final int TIMEZONE_JDK = 1; // 0x1
field public static final android.icu.util.TimeZone UNKNOWN_ZONE;
field public static final java.lang.String UNKNOWN_ZONE_ID = "Etc/Unknown";
}