Merge tag 'android-13.0.0_r11' into staging/lineage-20.0_merge-android-13.0.0_r11
Android 13.0.0 release 11
# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCY0jiSQAKCRDorT+BmrEO
# eEuIAJ49eo57U5PkuEjHfoGUhQZixkksTgCcCj+RH/QYEy9XzObU360nO5s47rU=
# =/fLk
# -----END PGP SIGNATURE-----
# gpg: Signature made Fri Oct 14 07:15:05 2022 EEST
# gpg: using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal]
# gpg: initial-contribution@android.com: Verified 1356 signatures in the past
# 11 months. Encrypted 4 messages in the past 9 months.
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4340 D135 70EF 945E 8381 0964 E8AD 3F81 9AB1 0E78
# By Paul Duffin
# Via Android Build Coastguard Worker (162) and others
* tag 'android-13.0.0_r11':
Added visibility needed for the S snapshot
Change-Id: I6ae64fb60e078566e4f0eb163c2578d5f4ca0239
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 {