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

Commit 2eb526a1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes from topic "ks2_with_keymint" am: ab1b8a7a am: 2694b808 

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

Change-Id: I877255fe782f7536a92ebdc3bf1fe6df9ec6dff5
parents 34cbddb1 2694b808

keystore/java/android/security/KeyStoreOperation.java

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

package android.security;





import android.annotation.NonNull;

import android.annotation.NonNull;

import android.hardware.keymint.KeyParameter;

import android.os.RemoteException;

import android.os.RemoteException;

import android.os.ServiceSpecificException;

import android.os.ServiceSpecificException;

import android.security.keymaster.KeymasterDefs;

import android.security.keymaster.KeymasterDefs;

import android.system.keystore2.IKeystoreOperation;

import android.system.keystore2.IKeystoreOperation;

import android.system.keystore2.KeyParameter;

import android.system.keystore2.ResponseCode;

import android.system.keystore2.ResponseCode;

import android.util.Log;

import android.util.Log;

keystore/java/android/security/KeyStoreSecurityLevel.java

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




import android.annotation.NonNull;

import android.annotation.NonNull;

import android.app.compat.CompatChanges;

import android.app.compat.CompatChanges;

import android.hardware.keymint.KeyParameter;

import android.os.RemoteException;

import android.os.RemoteException;

import android.os.ServiceSpecificException;

import android.os.ServiceSpecificException;

import android.security.keystore.BackendBusyException;

import android.security.keystore.BackendBusyException;
@@ -27,7 +28,6 @@ import android.system.keystore2.CreateOperationResponse; 
import android.system.keystore2.IKeystoreSecurityLevel;

import android.system.keystore2.IKeystoreSecurityLevel;

import android.system.keystore2.KeyDescriptor;

import android.system.keystore2.KeyDescriptor;

import android.system.keystore2.KeyMetadata;

import android.system.keystore2.KeyMetadata;

import android.system.keystore2.KeyParameter;

import android.system.keystore2.ResponseCode;

import android.system.keystore2.ResponseCode;

import android.util.Log;

import android.util.Log;

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

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

package android.security.keystore2;





import android.annotation.NonNull;

import android.annotation.NonNull;

import android.hardware.keymint.KeyParameter;

import android.security.keymaster.KeymasterDefs;

import android.security.keymaster.KeymasterDefs;

import android.security.keystore.ArrayUtils;

import android.security.keystore.ArrayUtils;

import android.security.keystore.KeyProperties;

import android.security.keystore.KeyProperties;

import android.system.keystore2.KeyParameter;





import java.security.AlgorithmParameters;

import java.security.AlgorithmParameters;

import java.security.InvalidAlgorithmParameterException;

import java.security.InvalidAlgorithmParameterException;

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

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




import android.annotation.NonNull;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.Nullable;

import android.hardware.keymint.KeyParameter;

import android.security.KeyStoreException;

import android.security.KeyStoreException;

import android.security.KeyStoreOperation;

import android.security.KeyStoreOperation;

import android.security.keymaster.KeymasterDefs;

import android.security.keymaster.KeymasterDefs;

import android.security.keystore.ArrayUtils;

import android.security.keystore.ArrayUtils;

import android.security.keystore.KeyProperties;

import android.security.keystore.KeyProperties;

import android.security.keystore2.KeyStoreCryptoOperationChunkedStreamer.Stream;

import android.security.keystore2.KeyStoreCryptoOperationChunkedStreamer.Stream;

import android.system.keystore2.KeyParameter;





import libcore.util.EmptyArray;

import libcore.util.EmptyArray;

keystore/java/android/security/keystore2/AndroidKeyStoreCipherSpiBase.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -19,11 +19,11 @@ package android.security.keystore2; 
import android.annotation.CallSuper;

import android.annotation.CallSuper;

import android.annotation.NonNull;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.Nullable;

import android.hardware.keymint.KeyParameter;

import android.security.KeyStoreException;

import android.security.KeyStoreException;

import android.security.KeyStoreOperation;

import android.security.KeyStoreOperation;

import android.security.keymaster.KeymasterDefs;

import android.security.keymaster.KeymasterDefs;

import android.security.keystore.KeyStoreCryptoOperation;

import android.security.keystore.KeyStoreCryptoOperation;

import android.system.keystore2.KeyParameter;





import libcore.util.EmptyArray;

import libcore.util.EmptyArray;