diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-05-29 20:51:51 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-29 20:51:51 +0000 |
| commit | db57c48e1c34d26823bc25e2da00e1056324efb4 (patch) | |
| tree | 0c7c2c52196447233738df6be7a62703514ebe5d | |
| parent | 68a00c524b38809efbc32f8c22597522b637d67c (diff) | |
| parent | d377b067358bf27eda2f1bdb806b9394a78e757c (diff) | |
| download | frameworks_base-db57c48e1c34d26823bc25e2da00e1056324efb4.zip frameworks_base-db57c48e1c34d26823bc25e2da00e1056324efb4.tar.gz frameworks_base-db57c48e1c34d26823bc25e2da00e1056324efb4.tar.bz2 | |
am d377b067: Merge "Cleanup Binder token resetting." into mnc-dev
* commit 'd377b067358bf27eda2f1bdb806b9394a78e757c':
Cleanup Binder token resetting.
| -rw-r--r-- | keystore/java/android/security/keystore/AndroidKeyStoreCipherSpiBase.java | 3 | ||||
| -rw-r--r-- | keystore/java/android/security/keystore/AndroidKeyStoreHmacSpi.java | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/keystore/java/android/security/keystore/AndroidKeyStoreCipherSpiBase.java b/keystore/java/android/security/keystore/AndroidKeyStoreCipherSpiBase.java index 4104dcc..be935a9 100644 --- a/keystore/java/android/security/keystore/AndroidKeyStoreCipherSpiBase.java +++ b/keystore/java/android/security/keystore/AndroidKeyStoreCipherSpiBase.java @@ -162,7 +162,6 @@ abstract class AndroidKeyStoreCipherSpiBase extends CipherSpi implements KeyStor protected void resetAll() { IBinder operationToken = mOperationToken; if (operationToken != null) { - mOperationToken = null; mKeyStore.abort(operationToken); } mEncrypting = false; @@ -186,9 +185,9 @@ abstract class AndroidKeyStoreCipherSpiBase extends CipherSpi implements KeyStor protected void resetWhilePreservingInitState() { IBinder operationToken = mOperationToken; if (operationToken != null) { - mOperationToken = null; mKeyStore.abort(operationToken); } + mOperationToken = null; mOperationHandle = 0; mMainDataStreamer = null; mCachedException = null; diff --git a/keystore/java/android/security/keystore/AndroidKeyStoreHmacSpi.java b/keystore/java/android/security/keystore/AndroidKeyStoreHmacSpi.java index b82a7f5..6422374 100644 --- a/keystore/java/android/security/keystore/AndroidKeyStoreHmacSpi.java +++ b/keystore/java/android/security/keystore/AndroidKeyStoreHmacSpi.java @@ -128,9 +128,9 @@ public abstract class AndroidKeyStoreHmacSpi extends MacSpi implements KeyStoreC mKey = null; IBinder operationToken = mOperationToken; if (operationToken != null) { - mOperationToken = null; mKeyStore.abort(operationToken); } + mOperationToken = null; mOperationHandle = 0; mChunkedStreamer = null; } @@ -138,9 +138,9 @@ public abstract class AndroidKeyStoreHmacSpi extends MacSpi implements KeyStoreC private void resetWhilePreservingInitState() { IBinder operationToken = mOperationToken; if (operationToken != null) { - mOperationToken = null; mKeyStore.abort(operationToken); } + mOperationToken = null; mOperationHandle = 0; mChunkedStreamer = null; } |