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

Commit ee300c22 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Clean up RecoveryController imports"

parents ba400bec d9f11a9b

services/core/java/com/android/server/locksettings/recoverablekeystore/RecoverableKeyStoreManager.java

+6 −8
Original line number Diff line number Diff line
@@ -16,12 +16,12 @@ 


package com.android.server.locksettings.recoverablekeystore;



import static android.security.keystore.RecoveryController.ERROR_BAD_CERTIFICATE_FORMAT;

import static android.security.keystore.RecoveryController.ERROR_DECRYPTION_FAILED;

import static android.security.keystore.RecoveryController.ERROR_INSECURE_USER;

import static android.security.keystore.RecoveryController.ERROR_NO_SNAPSHOT_PENDING;

import static android.security.keystore.RecoveryController.ERROR_SERVICE_INTERNAL_ERROR;

import static android.security.keystore.RecoveryController.ERROR_SESSION_EXPIRED;

import static android.security.keystore.recovery.RecoveryController.ERROR_BAD_CERTIFICATE_FORMAT;

import static android.security.keystore.recovery.RecoveryController.ERROR_DECRYPTION_FAILED;

import static android.security.keystore.recovery.RecoveryController.ERROR_INSECURE_USER;

import static android.security.keystore.recovery.RecoveryController.ERROR_NO_SNAPSHOT_PENDING;

import static android.security.keystore.recovery.RecoveryController.ERROR_SERVICE_INTERNAL_ERROR;

import static android.security.keystore.recovery.RecoveryController.ERROR_SESSION_EXPIRED;



import android.Manifest;

import android.annotation.NonNull;
@@ -58,10 +58,8 @@ import java.security.NoSuchAlgorithmException; 
import java.security.PublicKey;

import java.security.UnrecoverableKeyException;

import java.security.cert.CertPath;

import java.security.cert.Certificate;

import java.security.cert.CertificateEncodingException;

import java.security.cert.CertificateException;

import java.security.cert.X509Certificate;

import java.security.spec.InvalidKeySpecException;

import java.security.spec.X509EncodedKeySpec;

import java.util.Arrays;

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

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.server.locksettings.recoverablekeystore;



import android.security.keystore.RecoveryController;

import android.security.keystore.recovery.RecoveryController;

import android.util.Log;



import java.security.InvalidAlgorithmParameterException;
@@ -107,7 +107,7 @@ public class WrappedKey { 
     * @param keyMaterial The encrypted bytes of the key material.

     * @param platformKeyGenerationId The generation ID of the key used to wrap this key.

     *

     * @see RecoveryController.RECOVERY_STATUS_SYNC_IN_PROGRESS

     * @see RecoveryController#RECOVERY_STATUS_SYNC_IN_PROGRESS

     * @hide

     */

    public WrappedKey(byte[] nonce, byte[] keyMaterial, int platformKeyGenerationId) {

services/core/java/com/android/server/locksettings/recoverablekeystore/storage/ApplicationKeyStorage.java

+1 −3
Original line number Diff line number Diff line
@@ -16,15 +16,13 @@ 


package com.android.server.locksettings.recoverablekeystore.storage;



import static android.security.keystore.RecoveryController.ERROR_SERVICE_INTERNAL_ERROR;

import static android.security.keystore.recovery.RecoveryController.ERROR_SERVICE_INTERNAL_ERROR;



import android.annotation.Nullable;

import android.os.ServiceSpecificException;

import android.security.Credentials;

import android.security.keystore.KeyGenParameterSpec;

import android.security.keystore.KeyProperties;

import android.security.keystore.KeyProtection;

import android.security.keystore.recovery.KeyChainSnapshot;

import android.security.KeyStore;



import com.android.internal.annotations.VisibleForTesting;

services/tests/servicestests/src/com/android/server/locksettings/recoverablekeystore/storage/RecoverableKeyStoreDbTest.java

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ import org.junit.Test; 
import org.junit.runner.RunWith;



import android.content.Context;

import android.security.keystore.RecoveryController;

import android.security.keystore.recovery.RecoveryController;

import android.support.test.InstrumentationRegistry;

import android.support.test.filters.SmallTest;

import android.support.test.runner.AndroidJUnit4;