am 2afdf69b: Merge "CertPathSpi: fix encoding arg name"
* commit '2afdf69ba7a7a622b4b7b8db66553273eb7f0d36':
CertPathSpi: fix encoding arg name
diff --git a/luni/src/main/java/java/security/cert/CertificateFactorySpi.java b/luni/src/main/java/java/security/cert/CertificateFactorySpi.java
index 95c66e3..117ef65 100644
--- a/luni/src/main/java/java/security/cert/CertificateFactorySpi.java
+++ b/luni/src/main/java/java/security/cert/CertificateFactorySpi.java
@@ -106,14 +106,15 @@
/**
* Generates a {@code CertPath} (a certificate chain) from the given
- * {@code inputStream}, assuming the given {@code charsetName}.
+ * {@code inputStream}, assuming the given {@code encoding} from
+ * {@link #engineGetCertPathEncodings()}.
*
* @throws CertificateException
* if parsing problems are detected.
* @throws UnsupportedOperationException
* if the provider does not implement this method.
*/
- public CertPath engineGenerateCertPath(InputStream inStream, String charsetName)
+ public CertPath engineGenerateCertPath(InputStream inStream, String encoding)
throws CertificateException {
throw new UnsupportedOperationException();
}
