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;
     }