commit 3d22469a552b015a638eb71c815a031e006fbc3f
author Treehugger Robot <treehugger-gerrit@google.com> Fri May 19 12:41:18 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 19 12:41:20 2017 +0000
tree f34f52acbd0fb961575491bcf9eb61de35e6534f
parent d40197021f056fc6f9d4ead9d298fd45866ac1b9
parent 94200e5a4eb40bb8a32b7c87c6eb6ea48cfc3b79

Merge "Apply upstream OpenJDK 9 compilation fix to JapaneseDate."

ojluni/src/main/java/java/time/chrono/JapaneseDate.java

diff --git a/ojluni/src/main/java/java/time/chrono/JapaneseDate.java b/ojluni/src/main/java/java/time/chrono/JapaneseDate.java
index 45e6602..143c4a4 100644
--- a/ojluni/src/main/java/java/time/chrono/JapaneseDate.java
+++ b/ojluni/src/main/java/java/time/chrono/JapaneseDate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -432,7 +432,11 @@
                 field == ALIGNED_WEEK_OF_MONTH || field == ALIGNED_WEEK_OF_YEAR) {
             return false;
         }
-        return ChronoLocalDate.super.isSupported(field);
+        // Android-changed: Apply upstream OpenJDK 9 compilation fix.
+        // Applied OpenJDK 9 change from http://hg.openjdk.java.net/jdk9/dev/jdk/rev/2b7b09c81bf1
+        // On OpenJDK 8, either version is supported and has the same behavior.
+        // return ChronoLocalDate.super.isSupported(field);
+        return super.isSupported(field);
     }
 
     @Override