Merge 728ca0d208bdcdf630e9eb2aab0c132ed4bb4e81 on remote branch
Change-Id: Ib12fecd257c8572f11b4364cda38d480bc498543
diff --git a/JavaLibrary.bp b/JavaLibrary.bp
index 79521ba..f070571 100644
--- a/JavaLibrary.bp
+++ b/JavaLibrary.bp
@@ -919,6 +919,10 @@
"//build/soong/java/core-libraries",
"//frameworks/base",
"//frameworks/base/api",
+
+ // DO NOT REMOVE: Legacy visibility, needed for snapshots that are
+ // generated for the S build.
+ "//libcore/mmodules/core_platform_api",
],
srcs: [
":core_oj_api_files",
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 {