diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-05-13 15:57:09 -0700 |
|---|---|---|
| committer | Alex Klyubin <klyubin@google.com> | 2015-05-13 16:17:40 -0700 |
| commit | dcdaf87ed0aa99073638bcfe645949f130f0c7ad (patch) | |
| tree | a377474c30c5da15f447653dacbe12e25699bf0b /keystore/tests | |
| parent | 4ee67bc7a7bb84da1c92dc08427f9737ff8252d6 (diff) | |
| download | frameworks_base-dcdaf87ed0aa99073638bcfe645949f130f0c7ad.zip frameworks_base-dcdaf87ed0aa99073638bcfe645949f130f0c7ad.tar.gz frameworks_base-dcdaf87ed0aa99073638bcfe645949f130f0c7ad.tar.bz2 | |
Move Android Keystore impl to android.security.keystore.
This moves the non-public API classes backing Android Keystore from
android.security to android.security.keystore, a package specially
created for Android Keystore.
Bug: 18088752
Change-Id: Ibf04d6a26c54d310b0501fc5e34f37b1176324ad
Diffstat (limited to 'keystore/tests')
| -rw-r--r-- | keystore/tests/src/android/security/keystore/AndroidKeyPairGeneratorTest.java (renamed from keystore/tests/src/android/security/AndroidKeyPairGeneratorTest.java) | 4 | ||||
| -rw-r--r-- | keystore/tests/src/android/security/keystore/AndroidKeyStoreTest.java (renamed from keystore/tests/src/android/security/AndroidKeyStoreTest.java) | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/keystore/tests/src/android/security/AndroidKeyPairGeneratorTest.java b/keystore/tests/src/android/security/keystore/AndroidKeyPairGeneratorTest.java index 9c2f358..cad4e54 100644 --- a/keystore/tests/src/android/security/AndroidKeyPairGeneratorTest.java +++ b/keystore/tests/src/android/security/keystore/AndroidKeyPairGeneratorTest.java @@ -14,8 +14,10 @@ * limitations under the License. */ -package android.security; +package android.security.keystore; +import android.security.Credentials; +import android.security.KeyPairGeneratorSpec; import android.test.AndroidTestCase; import java.io.ByteArrayInputStream; diff --git a/keystore/tests/src/android/security/AndroidKeyStoreTest.java b/keystore/tests/src/android/security/keystore/AndroidKeyStoreTest.java index 4b2b9b5..2d4e4a0 100644 --- a/keystore/tests/src/android/security/AndroidKeyStoreTest.java +++ b/keystore/tests/src/android/security/keystore/AndroidKeyStoreTest.java @@ -14,13 +14,16 @@ * limitations under the License. */ -package android.security; +package android.security.keystore; import com.android.org.bouncycastle.x509.X509V3CertificateGenerator; import com.android.org.conscrypt.NativeConstants; import com.android.org.conscrypt.OpenSSLEngine; +import android.security.Credentials; +import android.security.KeyStore; +import android.security.KeyStoreParameter; import android.test.AndroidTestCase; import java.io.ByteArrayInputStream; @@ -1319,9 +1322,9 @@ public class AndroidKeyStoreTest extends AndroidTestCase { } public void testKeyStore_GetType_Encrypted_Success() throws Exception { - assertEquals(AndroidKeyStore.NAME, mKeyStore.getType()); + assertEquals(AndroidKeyStoreSpi.NAME, mKeyStore.getType()); setupPassword(); - assertEquals(AndroidKeyStore.NAME, mKeyStore.getType()); + assertEquals(AndroidKeyStoreSpi.NAME, mKeyStore.getType()); } public void testKeyStore_IsCertificateEntry_CA_Encrypted_Success() throws Exception { |