summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Klyubin <klyubin@google.com>2015-06-19 15:50:45 -0700
committerAlex Klyubin <klyubin@google.com>2015-06-19 15:50:45 -0700
commitae1e0e9265ce276d33ed47349074f443ea028b93 (patch)
treed50f5de4466d38cb9c4bfee346965da4cac30dad
parent7e786954e5821ad00335fae5d9c492c855631099 (diff)
downloadframeworks_base-ae1e0e9265ce276d33ed47349074f443ea028b93.zip
frameworks_base-ae1e0e9265ce276d33ed47349074f443ea028b93.tar.gz
frameworks_base-ae1e0e9265ce276d33ed47349074f443ea028b93.tar.bz2
Fix a bug in Android Keystore updateAAD.
The variant of CipherSpi.engineUpdateAAD which takes ByteBuffers delegated to a byte[]-taking variant of superclass instead of its own class. Bug: 18088752 Change-Id: I3b426bbdca54bbf7f6f3939589da07b24db14d0d
-rw-r--r--keystore/java/android/security/keystore/AndroidKeyStoreCipherSpiBase.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/keystore/java/android/security/keystore/AndroidKeyStoreCipherSpiBase.java b/keystore/java/android/security/keystore/AndroidKeyStoreCipherSpiBase.java
index fc53451..83131ed 100644
--- a/keystore/java/android/security/keystore/AndroidKeyStoreCipherSpiBase.java
+++ b/keystore/java/android/security/keystore/AndroidKeyStoreCipherSpiBase.java
@@ -446,7 +446,7 @@ abstract class AndroidKeyStoreCipherSpiBase extends CipherSpi implements KeyStor
inputLen = input.length;
src.get(input);
}
- super.engineUpdateAAD(input, inputOffset, inputLen);
+ engineUpdateAAD(input, inputOffset, inputLen);
}
@Override