summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Joachim Sauer <jsauer@google.com> 2017-04-24 15:44:02 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2017-04-24 15:44:03 +0000
commite08bd750c8f96ba59a12a5a7fa9ed3652f6c5149 (patch)
tree9210426b5db4a2975ec9bad4f7980dfa5f43f29d
parent21b9b3a8ffddde5044b428b086bbb601318d231b (diff)
parent40a72dc87821b8870042d99b4ec9335a229ec737 (diff)
Merge "Deprecate internal Calendar methods."
-rw-r--r--api/current.txt4
-rw-r--r--api/system-current.txt4
-rw-r--r--api/test-current.txt4
3 files changed, 6 insertions, 6 deletions
diff --git a/api/current.txt b/api/current.txt
index f59322a827a4..b93ef308a9bc 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -18179,9 +18179,9 @@ package android.icu.util {
method protected final void computeGregorianFields(int);
method protected int computeGregorianMonthStart(int, int);
method protected int computeJulianDay();
- method protected int computeMillisInDay();
+ method protected deprecated int computeMillisInDay();
method protected void computeTime();
- method protected int computeZoneOffset(long, int);
+ method protected deprecated int computeZoneOffset(long, int);
method public int fieldDifference(java.util.Date, int);
method protected java.lang.String fieldName(int);
method protected static final long floorDivide(long, long);
diff --git a/api/system-current.txt b/api/system-current.txt
index dab25acb0fbd..17619663cab8 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -19394,9 +19394,9 @@ package android.icu.util {
method protected final void computeGregorianFields(int);
method protected int computeGregorianMonthStart(int, int);
method protected int computeJulianDay();
- method protected int computeMillisInDay();
+ method protected deprecated int computeMillisInDay();
method protected void computeTime();
- method protected int computeZoneOffset(long, int);
+ method protected deprecated int computeZoneOffset(long, int);
method public int fieldDifference(java.util.Date, int);
method protected java.lang.String fieldName(int);
method protected static final long floorDivide(long, long);
diff --git a/api/test-current.txt b/api/test-current.txt
index 0126ae5571a0..d324db9b1216 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -18197,9 +18197,9 @@ package android.icu.util {
method protected final void computeGregorianFields(int);
method protected int computeGregorianMonthStart(int, int);
method protected int computeJulianDay();
- method protected int computeMillisInDay();
+ method protected deprecated int computeMillisInDay();
method protected void computeTime();
- method protected int computeZoneOffset(long, int);
+ method protected deprecated int computeZoneOffset(long, int);
method public int fieldDifference(java.util.Date, int);
method protected java.lang.String fieldName(int);
method protected static final long floorDivide(long, long);