Merge "OpenJDK 11: Merging in java.lang.*"
diff --git a/ojluni/src/main/java/java/lang/invoke/ConstantCallSite.java b/ojluni/src/main/java/java/lang/invoke/ConstantCallSite.java
index f27d0e7b..f7d87ba 100644
--- a/ojluni/src/main/java/java/lang/invoke/ConstantCallSite.java
+++ b/ojluni/src/main/java/java/lang/invoke/ConstantCallSite.java
@@ -30,6 +30,7 @@
* An {@code invokedynamic} instruction linked to a {@code ConstantCallSite} is permanently
* bound to the call site's target.
* @author John Rose, JSR 292 EG
+ * @since 1.7
*/
public class ConstantCallSite extends CallSite {
private final boolean isFrozen;
diff --git a/ojluni/src/main/java/java/lang/invoke/LambdaConversionException.java b/ojluni/src/main/java/java/lang/invoke/LambdaConversionException.java
index e1123da..2dc8f22 100644
--- a/ojluni/src/main/java/java/lang/invoke/LambdaConversionException.java
+++ b/ojluni/src/main/java/java/lang/invoke/LambdaConversionException.java
@@ -27,6 +27,8 @@
/**
* LambdaConversionException
+ *
+ * @since 1.8
*/
public class LambdaConversionException extends Exception {
private static final long serialVersionUID = 292L + 8L;
diff --git a/ojluni/src/main/java/java/lang/package-info.java b/ojluni/src/main/java/java/lang/package-info.java
index 0068e8f..882a610 100644
--- a/ojluni/src/main/java/java/lang/package-info.java
+++ b/ojluni/src/main/java/java/lang/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2018, 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
diff --git a/ojluni/src/main/java/java/lang/ref/package-info.java b/ojluni/src/main/java/java/lang/ref/package-info.java
index 239d08d..3f37878 100644
--- a/ojluni/src/main/java/java/lang/ref/package-info.java
+++ b/ojluni/src/main/java/java/lang/ref/package-info.java
@@ -23,7 +23,6 @@
* questions.
*/
-// Android-changed: Remove docs to java.lang.ref.Cleaner until it's imported
/**
* Provides reference-object classes, which support a limited degree
* of interaction with the garbage collector. A program may use a
@@ -45,6 +44,8 @@
* implementing canonicalizing mappings that do not prevent their keys
* (or values) from being reclaimed, and phantom references are for
* scheduling post-mortem cleanup actions.
+ * Post-mortem cleanup actions can be registered and managed by a
+ * {@link java.lang.ref.Cleaner}.
*
* <p> Each reference-object type is implemented by a subclass of the
* abstract base {@link java.lang.ref.Reference} class.
diff --git a/ojluni/src/main/java/java/lang/reflect/MalformedParameterizedTypeException.java b/ojluni/src/main/java/java/lang/reflect/MalformedParameterizedTypeException.java
index 31fbcb4..b485be1 100644
--- a/ojluni/src/main/java/java/lang/reflect/MalformedParameterizedTypeException.java
+++ b/ojluni/src/main/java/java/lang/reflect/MalformedParameterizedTypeException.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2017, 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
diff --git a/ojluni/src/main/java/java/lang/reflect/package-info.java b/ojluni/src/main/java/java/lang/reflect/package-info.java
index 258a07e..e771f31 100644
--- a/ojluni/src/main/java/java/lang/reflect/package-info.java
+++ b/ojluni/src/main/java/java/lang/reflect/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2017, 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
@@ -24,12 +24,11 @@
*/
/**
- * Provides classes and interfaces for obtaining reflective
- * information about classes and objects. Reflection allows
- * programmatic access to information about the fields, methods and
- * constructors of loaded classes, and the use of reflected fields,
- * methods, and constructors to operate on their underlying
- * counterparts, within security restrictions.
+ * Provides classes and interfaces for obtaining reflective information about
+ * classes and objects. Reflection allows programmatic access to information
+ * about the fields, methods and constructors of loaded classes, and the use
+ * of reflected fields, methods, and constructors to operate on their underlying
+ * counterparts, within encapsulation and security restrictions.
*
* <p>{@code AccessibleObject} allows suppression of access checks if
* the necessary {@code ReflectPermission} is available.
@@ -44,6 +43,8 @@
* members of a target object (based on its runtime class) or the
* members declared by a given class.
*
- * @since JDK1.1
+ * @since 1.1
+ * @revised 9
+ * @spec JPMS
*/
package java.lang.reflect;