From 0a7e13909008ae73ab81f13e6a914edfc8150aae Mon Sep 17 00:00:00 2001
From: Sergio Giro <sgiro@google.com>
Date: Tue, 23 Aug 2016 22:08:13 +0100
Subject: [PATCH] javax.crypto.spec: update PBEParameterSpec to Java 8

Pulling upstream changes from OpenJDK version jdk8u60 for
PBEParameterSpec.

Added new constructor allowing an AlgorithmParameterSpec and the
corresponding getter getParameterSpec.

This CL finishes the port of this package.

Change-Id: I02d463285e185fcb4031a5266d2857b1530159b7
Test: make droid docs, vogar PBEParameterSpecTest
Bug: 29631070
---
 api/current.txt        | 2 ++
 api/system-current.txt | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/api/current.txt b/api/current.txt
index 3cee0f5f6597d..d6b1594265ab6 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -61018,7 +61018,9 @@ package javax.crypto.spec {
 
   public class PBEParameterSpec implements java.security.spec.AlgorithmParameterSpec {
     ctor public PBEParameterSpec(byte[], int);
+    ctor public PBEParameterSpec(byte[], int, java.security.spec.AlgorithmParameterSpec);
     method public int getIterationCount();
+    method public java.security.spec.AlgorithmParameterSpec getParameterSpec();
     method public byte[] getSalt();
   }
 
diff --git a/api/system-current.txt b/api/system-current.txt
index 9c6d6f5912453..1662a72223a30 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -63636,7 +63636,9 @@ package javax.crypto.spec {
 
   public class PBEParameterSpec implements java.security.spec.AlgorithmParameterSpec {
     ctor public PBEParameterSpec(byte[], int);
+    ctor public PBEParameterSpec(byte[], int, java.security.spec.AlgorithmParameterSpec);
     method public int getIterationCount();
+    method public java.security.spec.AlgorithmParameterSpec getParameterSpec();
     method public byte[] getSalt();
   }