diff options
| author | 2017-01-17 11:21:01 +0000 | |
|---|---|---|
| committer | 2017-01-17 11:21:01 +0000 | |
| commit | d6be4be618436390643b7ee000fb4dd36ce81c1e (patch) | |
| tree | 35701f1818d2ada3a6c6f664ce672125408bc998 | |
| parent | 8cf71695649a0760399d36bb90b7aa30920100cb (diff) | |
| parent | d8d1d9682d11e9631dcd1aa453202846fea8b539 (diff) | |
Merge "API: Update java.util.Date to OpenJDK8u60" am: a2343a7e78
am: d8d1d9682d
Change-Id: I04b50fee184ba129d986832bfadbee8325f9c56f
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 | ||||
| -rw-r--r-- | api/test-current.txt | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index fd2fb2f0598a..d53f58c837aa 100644 --- a/api/current.txt +++ b/api/current.txt @@ -60574,6 +60574,7 @@ package java.util { method public boolean before(java.util.Date); method public java.lang.Object clone(); method public int compareTo(java.util.Date); + method public static java.util.Date from(java.time.Instant); method public deprecated int getDate(); method public deprecated int getDay(); method public deprecated int getHours(); @@ -60592,6 +60593,7 @@ package java.util { method public void setTime(long); method public deprecated void setYear(int); method public deprecated java.lang.String toGMTString(); + method public java.time.Instant toInstant(); method public deprecated java.lang.String toLocaleString(); } diff --git a/api/system-current.txt b/api/system-current.txt index f42e1f2c1898..41cb4f939829 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -64174,6 +64174,7 @@ package java.util { method public boolean before(java.util.Date); method public java.lang.Object clone(); method public int compareTo(java.util.Date); + method public static java.util.Date from(java.time.Instant); method public deprecated int getDate(); method public deprecated int getDay(); method public deprecated int getHours(); @@ -64192,6 +64193,7 @@ package java.util { method public void setTime(long); method public deprecated void setYear(int); method public deprecated java.lang.String toGMTString(); + method public java.time.Instant toInstant(); method public deprecated java.lang.String toLocaleString(); } diff --git a/api/test-current.txt b/api/test-current.txt index f99e431e2cf3..4c4998e02125 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -60665,6 +60665,7 @@ package java.util { method public boolean before(java.util.Date); method public java.lang.Object clone(); method public int compareTo(java.util.Date); + method public static java.util.Date from(java.time.Instant); method public deprecated int getDate(); method public deprecated int getDay(); method public deprecated int getHours(); @@ -60683,6 +60684,7 @@ package java.util { method public void setTime(long); method public deprecated void setYear(int); method public deprecated java.lang.String toGMTString(); + method public java.time.Instant toInstant(); method public deprecated java.lang.String toLocaleString(); } |