From 0a1066a45470cd3eb74f8c8090df7858449597bb Mon Sep 17 00:00:00 2001
From: Joachim Sauer <jsauer@google.com>
Date: Thu, 20 Apr 2017 12:00:39 +0100
Subject: [PATCH] Deprecate internal Calendar methods.

These methods suffer from a potential integer overflow that can't be
fixed without changing their signature as described at
http://bugs.icu-project.org/trac/ticket/11632.

Since they could be overridden, we need to deprecate them for at least
one release before changing/removing them.

Bug: 30300853
Test: m checkbuild && m offline-sdk-referenceonly-docs

(cherry picked from commit 40a72dc87821b8870042d99b4ec9335a229ec737)

Change-Id: I18f97a7085b69a6d0d95b0cf10f7dfce1077ee9f
---
 api/current.txt        | 4 ++--
 api/system-current.txt | 4 ++--
 api/test-current.txt   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index 7c1e2a64ac635..6c3336b1819e0 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -19269,9 +19269,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 130fb52c55702..5a3e8b1129dba 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -20772,9 +20772,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 9ce51444eb7ef..bd368fb078fe8 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -19319,9 +19319,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);