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

Commit 30f8a371 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Revert "Keystore 2.0 SPI: Move keymint spec to security ...""... 

Merge "Revert "Revert "Keystore 2.0 SPI: Move keymint spec to security ..."" am: dd8891ac am: 4ac4916c am: cf7203f5

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1525189

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I024a2f38dfd2432ae77d6a032c27fc8389cf62dc
parents 87960020 cf7203f5

core/java/android/security/keymaster/KeymasterDefs.java

+12 −12
Original line number Diff line number Diff line
@@ -16,18 +16,18 @@ 


package android.security.keymaster;



import android.hardware.keymint.Algorithm;

import android.hardware.keymint.BlockMode;

import android.hardware.keymint.Digest;

import android.hardware.keymint.ErrorCode;

import android.hardware.keymint.HardwareAuthenticatorType;

import android.hardware.keymint.KeyFormat;

import android.hardware.keymint.KeyOrigin;

import android.hardware.keymint.KeyPurpose;

import android.hardware.keymint.PaddingMode;

import android.hardware.keymint.SecurityLevel;

import android.hardware.keymint.Tag;

import android.hardware.keymint.TagType;

import android.hardware.security.keymint.Algorithm;

import android.hardware.security.keymint.BlockMode;

import android.hardware.security.keymint.Digest;

import android.hardware.security.keymint.ErrorCode;

import android.hardware.security.keymint.HardwareAuthenticatorType;

import android.hardware.security.keymint.KeyFormat;

import android.hardware.security.keymint.KeyOrigin;

import android.hardware.security.keymint.KeyPurpose;

import android.hardware.security.keymint.PaddingMode;

import android.hardware.security.keymint.SecurityLevel;

import android.hardware.security.keymint.Tag;

import android.hardware.security.keymint.TagType;



import java.util.HashMap;

import java.util.Map;

keystore/java/android/security/KeyStoreOperation.java

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
package android.security;



import android.annotation.NonNull;

import android.hardware.keymint.KeyParameter;

import android.hardware.security.keymint.KeyParameter;

import android.os.RemoteException;

import android.os.ServiceSpecificException;

import android.security.keymaster.KeymasterDefs;

keystore/java/android/security/KeyStoreSecurityLevel.java

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package android.security; 


import android.annotation.NonNull;

import android.app.compat.CompatChanges;

import android.hardware.keymint.KeyParameter;

import android.hardware.security.keymint.KeyParameter;

import android.os.RemoteException;

import android.os.ServiceSpecificException;

import android.security.keystore.BackendBusyException;

keystore/java/android/security/keystore2/AndroidKeyStore3DESCipherSpi.java

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
package android.security.keystore2;



import android.annotation.NonNull;

import android.hardware.keymint.KeyParameter;

import android.hardware.security.keymint.KeyParameter;

import android.security.keymaster.KeymasterDefs;

import android.security.keystore.ArrayUtils;

import android.security.keystore.KeyProperties;

keystore/java/android/security/keystore2/AndroidKeyStoreAuthenticatedAESCipherSpi.java

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package android.security.keystore2; 


import android.annotation.NonNull;

import android.annotation.Nullable;

import android.hardware.keymint.KeyParameter;

import android.hardware.security.keymint.KeyParameter;

import android.security.KeyStoreException;

import android.security.KeyStoreOperation;

import android.security.keymaster.KeymasterDefs;