Merge
diff --git a/jdk/.hgtags b/jdk/.hgtags
index 140c696..22ccd8a 100644
--- a/jdk/.hgtags
+++ b/jdk/.hgtags
@@ -417,3 +417,4 @@
0ff9ad7d067cd4fa14450cf208bf019175a0aaba jdk-9+172
a5506b425f1bf91530d8417b57360e5d89328c0c jdk-9+173
42f18c931bd4fae5c206ccf6d8e591e4c4e69d31 jdk-9+174
+e6c4f6ef717d104dba880e2dae538690c993b46f jdk-9+175
diff --git a/jdk/make/src/classes/build/tools/taglet/ModuleGraph.java b/jdk/make/src/classes/build/tools/taglet/ModuleGraph.java
index 6983eaa..6e2b030 100644
--- a/jdk/make/src/classes/build/tools/taglet/ModuleGraph.java
+++ b/jdk/make/src/classes/build/tools/taglet/ModuleGraph.java
@@ -29,6 +29,7 @@
import java.util.List;
import java.util.Set;
import javax.lang.model.element.Element;
+import javax.lang.model.element.ModuleElement;
import com.sun.source.doctree.DocTree;
import jdk.javadoc.doclet.Taglet;
import static jdk.javadoc.doclet.Taglet.Location.*;
@@ -62,7 +63,7 @@
return "";
}
- String moduleName = element.getSimpleName().toString();
+ String moduleName = ((ModuleElement) element).getQualifiedName().toString();
String imageFile = moduleName + "-graph.png";
int thumbnailHeight = -1;
String hoverImage = "";
diff --git a/jdk/src/java.base/share/classes/java/lang/RuntimePermission.java b/jdk/src/java.base/share/classes/java/lang/RuntimePermission.java
index 762740a..6867aed 100644
--- a/jdk/src/java.base/share/classes/java/lang/RuntimePermission.java
+++ b/jdk/src/java.base/share/classes/java/lang/RuntimePermission.java
@@ -340,14 +340,6 @@
* </tr>
*
* <tr>
- * <td>usePolicy</td>
- * <td>Granting this permission disables the Java Plug-In's default
- * security prompting behavior.</td>
- * <td>For more information, refer to the <a href=
- * "../../../technotes/guides/deploy/index.html">deployment guide</a>.
- * </td>
- * </tr>
- * <tr>
* <td>manageProcess</td>
* <td>Native process termination and information about processes
* {@link ProcessHandle}.</td>
