merge in jb-release history after reset to jb-dev
diff --git a/include/media/hardware/CryptoAPI.h b/include/media/hardware/CryptoAPI.h
index 44a0040..810a443 100644
--- a/include/media/hardware/CryptoAPI.h
+++ b/include/media/hardware/CryptoAPI.h
@@ -70,9 +70,7 @@
// At the java level these special errors will then trigger a
// MediaCodec.CryptoException that gives clients access to both
// the error code and the errorDetailMsg.
- // Returns a non-negative result to indicate the number of bytes written
- // to the dstPtr, or a negative result to indicate an error.
- virtual ssize_t decrypt(
+ virtual status_t decrypt(
bool secure,
const uint8_t key[16],
const uint8_t iv[16],
