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

Commit c623d988 authored by Alex Klyubin's avatar Alex Klyubin Committed by Android Git Automerger
Browse files

am db57c48e: am d377b067: Merge "Cleanup Binder token resetting." into mnc-dev 

* commit 'db57c48e':
  Cleanup Binder token resetting.
parents 7eac7b5a db57c48e

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

+1 −2
Original line number Diff line number Diff line
@@ -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;

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

+2 −2
Original line number Diff line number Diff line
@@ -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;

    }