commit e917bfbd19c265ef09c90f93f5dc175fc62259f5
author jp abgrall <jpa@google.com> Mon Sep 17 10:58:38 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Sep 17 10:58:38 2012 -0700
tree 220e8ee17e1305986dceb590394bd2a836090420
parent f456d32d3c3aea966b5fba43e6d34f72df06c60d
parent 09a22fc29d588b173e5c0dd2002ac2c44d45b7c6

am 09a22fc2: Merge "Allow disable of dumpstate vibrate"

* commit '09a22fc29d588b173e5c0dd2002ac2c44d45b7c6':
  Allow disable of dumpstate vibrate

include/media/hardware/CryptoAPI.h

diff --git a/include/media/hardware/CryptoAPI.h b/include/media/hardware/CryptoAPI.h
index 810a443..44a0040 100644
--- a/include/media/hardware/CryptoAPI.h
+++ b/include/media/hardware/CryptoAPI.h
@@ -70,7 +70,9 @@
     // 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.
-    virtual status_t decrypt(
+    // 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(
             bool secure,
             const uint8_t key[16],
             const uint8_t iv[16],