commit 76f03cf09f38fb19c348277cdc640f6d1e940796
author Shao-Chuan Lee <shaochuan@google.com> Tue Oct 11 02:09:00 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Oct 11 02:09:00 2022 +0000
tree e90d18e6ceb94d038ecda60dbbede8c6bbc24590
parent 8b1400cb5c4582481433ecf56284fa1e594efd66
parent 3c403814d10c3f4f0e48e894e5acb55cb1bbdf76

[automerger skipped] DO NOT MERGE Use explicitly opened file with O_WRONLY in test_sendfile_errno am: f0324559dd -s ours am: b800078f99 -s ours am: 4c2c16a044 -s ours am: 014b3ea94b -s ours am: 1ee27cb06b -s ours am: 599728ca03 -s ours am: 85d156bc83 -s ours am: 7494b7391a -s ours am: aec700710d -s ours am: 9c79f8862d -s ours am: 3c403814d1 -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/libcore/+/2241795

Change-Id: I8d61fb30b29a87ed247dd85464e3f533916d5af9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

luni/src/test/java/libcore/java/util/TimeZoneTest.java

diff --git a/luni/src/test/java/libcore/java/util/TimeZoneTest.java b/luni/src/test/java/libcore/java/util/TimeZoneTest.java
index 145c2d1..f871da1 100644
--- a/luni/src/test/java/libcore/java/util/TimeZoneTest.java
+++ b/luni/src/test/java/libcore/java/util/TimeZoneTest.java
@@ -108,7 +108,10 @@
     public void testGetDisplayNameShort_nonHourOffsets() {
         TimeZone iranTz = TimeZone.getTimeZone("Asia/Tehran");
         assertEquals("GMT+03:30", iranTz.getDisplayName(false, TimeZone.SHORT, Locale.UK));
-        assertEquals("GMT+04:30", iranTz.getDisplayName(true, TimeZone.SHORT, Locale.UK));
+
+        TimeZone chathamTz = TimeZone.getTimeZone("Pacific/Chatham");
+        assertEquals("GMT+12:45", chathamTz.getDisplayName(false, TimeZone.SHORT, Locale.UK));
+        assertEquals("GMT+13:45", chathamTz.getDisplayName(true, TimeZone.SHORT, Locale.UK));
     }
 
     public void testPreHistoricOffsets() throws Exception {