commit d377b067358bf27eda2f1bdb806b9394a78e757c
author Alex Klyubin <klyubin@google.com> Fri May 29 19:59:33 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 29 19:59:34 2015 +0000
tree 5c7a7e49fb729a7e92bb028c700554dded39322b
parent 2473e1e92241b532294524afb9e668497cd86258
parent 96d7245c00be386355ec583ac980b024b223218b

Merge "Cleanup Binder token resetting." into mnc-dev

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

diff --git a/keystore/java/android/security/keystore/AndroidKeyStoreCipherSpiBase.java b/keystore/java/android/security/keystore/AndroidKeyStoreCipherSpiBase.java
index 4104dcc..be935a97 100644
--- a/keystore/java/android/security/keystore/AndroidKeyStoreCipherSpiBase.java
+++ b/keystore/java/android/security/keystore/AndroidKeyStoreCipherSpiBase.java
@@ -162,7 +162,6 @@
     protected void resetAll() {
         IBinder operationToken = mOperationToken;
         if (operationToken != null) {
-            mOperationToken = null;
             mKeyStore.abort(operationToken);
         }
         mEncrypting = false;
@@ -186,9 +185,9 @@
     protected void resetWhilePreservingInitState() {
         IBinder operationToken = mOperationToken;
         if (operationToken != null) {
-            mOperationToken = null;
             mKeyStore.abort(operationToken);
         }
+        mOperationToken = null;
         mOperationHandle = 0;
         mMainDataStreamer = null;
         mCachedException = null;

keystore/java/android/security/keystore/AndroidKeyStoreHmacSpi.java

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 @@
         mKey = null;
         IBinder operationToken = mOperationToken;
         if (operationToken != null) {
-            mOperationToken = null;
             mKeyStore.abort(operationToken);
         }
+        mOperationToken = null;
         mOperationHandle = 0;
         mChunkedStreamer = null;
     }
@@ -138,9 +138,9 @@
     private void resetWhilePreservingInitState() {
         IBinder operationToken = mOperationToken;
         if (operationToken != null) {
-            mOperationToken = null;
             mKeyStore.abort(operationToken);
         }
+        mOperationToken = null;
         mOperationHandle = 0;
         mChunkedStreamer = null;
     }