am d684ebd3: am 0bd10c21: am 5960c3d5: Merge "Add unauthenticated AES ciphers backed by AndroidKeyStore."

* commit 'd684ebd3a62cb026048d9eebacddb0f824113a5e':
  Add unauthenticated AES ciphers backed by AndroidKeyStore.

1 files changed, 2 insertions, 25 deletions

diff --git a/keystore/java/android/security/KeyStoreHmacSpi.java b/keystore/java/android/security/KeyStoreHmacSpi.java
index 3080d7b..e3c98b8 100644
--- a/keystore/java/android/security/KeyStoreHmacSpi.java
+++ b/keystore/java/android/security/KeyStoreHmacSpi.java
@@ -93,7 +93,8 @@ public abstract class KeyStoreHmacSpi extends MacSpi {
             throw new CryptoOperationException("Keystore returned null operation token");
         }
         mChunkedStreamer = new KeyStoreCryptoOperationChunkedStreamer(
-                new KeyStoreStreamingConsumer(mKeyStore, mOperationToken));
+                new KeyStoreCryptoOperationChunkedStreamer.MainDataStream(
+                        mKeyStore, mOperationToken));
     }
 
     @Override
@@ -147,28 +148,4 @@ public abstract class KeyStoreHmacSpi extends MacSpi {
             super.finalize();
         }
     }
-
-    /**
-     * KeyStore-backed consumer of {@code MacSpi}'s chunked stream.
-     */
-    private static class KeyStoreStreamingConsumer
-            implements KeyStoreCryptoOperationChunkedStreamer.KeyStoreOperation {
-        private final KeyStore mKeyStore;
-        private final IBinder mOperationToken;
-
-        private KeyStoreStreamingConsumer(KeyStore keyStore, IBinder operationToken) {
-            mKeyStore = keyStore;
-            mOperationToken = operationToken;
-        }
-
-        @Override
-        public OperationResult update(byte[] input) {
-            return mKeyStore.update(mOperationToken, null, input);
-        }
-
-        @Override
-        public OperationResult finish(byte[] input) {
-            return mKeyStore.finish(mOperationToken, null, input);
-        }
-    }
 }