Merge
authorprr
Wed, 13 Dec 2017 10:56:50 -0800
changeset 48346 1f38b6c89f8a
parent 48345 4966e9237b88 (diff)
parent 48292 191ae61bd1e9 (current diff)
child 48347 4f9683bf0923
Merge
src/java.base/share/classes/java/lang/StringDecoderUTF8.java
test/java/util/Calendar/Bug8185841.java
test/langtools/jdk/javadoc/doclet/testMemberInheritence/TestMemberInheritence.java
test/langtools/jdk/javadoc/doclet/testMemberInheritence/diamond/A.java
test/langtools/jdk/javadoc/doclet/testMemberInheritence/diamond/B.java
test/langtools/jdk/javadoc/doclet/testMemberInheritence/diamond/C.java
test/langtools/jdk/javadoc/doclet/testMemberInheritence/diamond/X.java
test/langtools/jdk/javadoc/doclet/testMemberInheritence/diamond/Z.java
test/langtools/jdk/javadoc/doclet/testMemberInheritence/inheritDist/A.java
test/langtools/jdk/javadoc/doclet/testMemberInheritence/inheritDist/B.java
test/langtools/jdk/javadoc/doclet/testMemberInheritence/inheritDist/C.java
test/langtools/jdk/javadoc/doclet/testMemberInheritence/pkg/BaseClass.java
test/langtools/jdk/javadoc/doclet/testMemberInheritence/pkg/BaseInterface.java
test/langtools/jdk/javadoc/doclet/testMemberInheritence/pkg/SubClass.java
test/langtools/jdk/javadoc/doclet/testMemberInheritence/pkg1/Implementer.java
test/langtools/jdk/javadoc/doclet/testMemberInheritence/pkg1/Interface.java
test/langtools/jdk/javadoc/doclet/testOverridenMethods/TestBadOverride.java
test/langtools/jdk/javadoc/doclet/testOverridenMethods/TestMultiInheritence.java
test/langtools/jdk/javadoc/doclet/testOverridenMethods/TestOverrideMethods.java
test/langtools/jdk/javadoc/doclet/testOverridenMethods/TestOverridenMethodDocCopy.java
test/langtools/jdk/javadoc/doclet/testOverridenMethods/TestOverridenPrivateMethods.java
test/langtools/jdk/javadoc/doclet/testOverridenMethods/TestOverridenPrivateMethodsWithPackageFlag.java
test/langtools/jdk/javadoc/doclet/testOverridenMethods/TestOverridenPrivateMethodsWithPrivateFlag.java
test/langtools/jdk/javadoc/doclet/testOverridenMethods/pkg1/BaseClass.java
test/langtools/jdk/javadoc/doclet/testOverridenMethods/pkg1/SubClass.java
test/langtools/jdk/javadoc/doclet/testOverridenMethods/pkg2/SubClass.java
test/langtools/jdk/javadoc/doclet/testOverridenMethods/pkg3/I0.java
test/langtools/jdk/javadoc/doclet/testOverridenMethods/pkg3/I1.java
test/langtools/jdk/javadoc/doclet/testOverridenMethods/pkg3/I2.java
test/langtools/jdk/javadoc/doclet/testOverridenMethods/pkg3/I3.java
test/langtools/jdk/javadoc/doclet/testOverridenMethods/pkg3/I4.java
test/langtools/jdk/javadoc/doclet/testOverridenMethods/pkg4/Foo.java
test/langtools/jdk/javadoc/doclet/testOverridenMethods/pkg5/Classes.java
test/langtools/jdk/javadoc/doclet/testOverridenMethods/pkg5/Interfaces.java
test/langtools/jdk/javadoc/doclet/testOverridenMethods/pkg5/TestEnum.java
--- a/src/java.desktop/share/classes/java/awt/Toolkit.java	Wed Dec 13 10:25:38 2017 -0800
+++ b/src/java.desktop/share/classes/java/awt/Toolkit.java	Wed Dec 13 10:56:50 2017 -0800
@@ -673,11 +673,13 @@
      * <p>
      * This method first checks if there is a security manager installed.
      * If so, the method calls the security manager's
-     * {@code checkPermission} method with the
-     * url.openConnection().getPermission() permission to ensure
-     * that the access to the image is allowed. For compatibility
-     * with pre-1.2 security managers, if the access is denied with
-     * {@code FilePermission} or {@code SocketPermission},
+     * {@code checkPermission} method with the corresponding
+     * permission to ensure that the access to the image is allowed.
+     * If the connection to the specified URL requires
+     * either {@code URLPermission} or {@code SocketPermission},
+     * then {@code URLPermission} is used for security checks.
+     * For compatibility with pre-1.2 security managers, if the access
+     * is denied with {@code FilePermission} or {@code SocketPermission},
      * the method throws the {@code SecurityException}
      * if the corresponding 1.1-style SecurityManager.checkXXX method
      * also denies permission.
@@ -717,11 +719,13 @@
      * <p>
      * This method first checks if there is a security manager installed.
      * If so, the method calls the security manager's
-     * {@code checkPermission} method with the
-     * url.openConnection().getPermission() permission to ensure
-     * that the image creation is allowed. For compatibility
-     * with pre-1.2 security managers, if the access is denied with
-     * {@code FilePermission} or {@code SocketPermission},
+     * {@code checkPermission} method with the corresponding
+     * permission to ensure that the image creation is allowed.
+     * If the connection to the specified URL requires
+     * either {@code URLPermission} or {@code SocketPermission},
+     * then {@code URLPermission} is used for security checks.
+     * For compatibility with pre-1.2 security managers, if the access
+     * is denied with {@code FilePermission} or {@code SocketPermission},
      * the method throws {@code SecurityException}
      * if the corresponding 1.1-style SecurityManager.checkXXX method
      * also denies permission.