Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5397d4d5 authored by Robert Berry's avatar Robert Berry
Browse files

Move recoverablekeystore package under services 

As these helpers will be used by the service, these properly belong there.

Test: Unit tests.
Change-Id: I4fb4fe2ed52581790421885680473a7b9638f332
parent b3b66ee6

core/java/android/security/recoverablekeystore/RecoverableKeyGenerator.java→services/core/java/com/android/server/locksettings/recoverablekeystore/RecoverableKeyGenerator.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package android.security.recoverablekeystore;

package com.android.server.locksettings.recoverablekeystore;



import android.security.keystore.AndroidKeyStoreSecretKey;

import android.security.keystore.KeyProperties;

core/java/android/security/recoverablekeystore/RecoverableKeyStorage.java→services/core/java/com/android/server/locksettings/recoverablekeystore/RecoverableKeyStorage.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package android.security.recoverablekeystore;

package com.android.server.locksettings.recoverablekeystore;



import android.security.keystore.KeyProtection;

core/java/android/security/recoverablekeystore/RecoverableKeyStorageImpl.java→services/core/java/com/android/server/locksettings/recoverablekeystore/RecoverableKeyStorageImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package android.security.recoverablekeystore;

package com.android.server.locksettings.recoverablekeystore;



import android.security.keystore.KeyProtection;

core/java/android/security/recoverablekeystore/WrappedKey.java→services/core/java/com/android/server/locksettings/recoverablekeystore/WrappedKey.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package android.security.recoverablekeystore;

package com.android.server.locksettings.recoverablekeystore;



import java.security.InvalidKeyException;

import java.security.KeyStoreException;

core/tests/coretests/src/android/security/recoverablekeystore/RecoverableKeyGeneratorTest.java→services/tests/servicestests/src/com/android/server/locksettings/recoverablekeystore/RecoverableKeyGeneratorTest.java

+3 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package android.security.recoverablekeystore;

package com.android.server.locksettings.recoverablekeystore;



import static org.junit.Assert.assertArrayEquals;

import static org.junit.Assert.assertEquals;
@@ -53,7 +53,8 @@ public class RecoverableKeyGeneratorTest { 
    private static final String TEST_ALIAS = "karlin";

    private static final String WRAPPING_KEY_ALIAS = "RecoverableKeyGeneratorTestWrappingKey";



    @Mock RecoverableKeyStorage mRecoverableKeyStorage;

    @Mock

    RecoverableKeyStorage mRecoverableKeyStorage;



    @Captor ArgumentCaptor<KeyProtection> mKeyProtectionArgumentCaptor;