diff options
| author | Jeff Tinker <jtinker@google.com> | 2015-05-06 17:22:33 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-06 17:22:35 +0000 |
| commit | 26d955fd02e0bf3f76c50bceeba4b61598f1a8b2 (patch) | |
| tree | e288c5e03ea9bbcf9eeaf34542b980947aa0f250 /media | |
| parent | 71b0cb043f410d7f0a7852b2f297124fa9aed0e2 (diff) | |
| parent | fc48bf78a2dbf9c145ddaba27dbb191a9ceaf18e (diff) | |
| download | frameworks_base-26d955fd02e0bf3f76c50bceeba4b61598f1a8b2.zip frameworks_base-26d955fd02e0bf3f76c50bceeba4b61598f1a8b2.tar.gz frameworks_base-26d955fd02e0bf3f76c50bceeba4b61598f1a8b2.tar.bz2 | |
Merge "Clarify wording of MediaCrypto exception "ERROR_NO_KEY"" into mnc-dev
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/media/MediaCodec.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/media/java/android/media/MediaCodec.java b/media/java/android/media/MediaCodec.java index 8220a74..6f7b583 100644 --- a/media/java/android/media/MediaCodec.java +++ b/media/java/android/media/MediaCodec.java @@ -918,9 +918,9 @@ final public class MediaCodec { } /** - * This indicates that no key has been set to perform the requested - * decrypt operation. The operation can be retried after adding - * a decryption key. + * This indicates that the requested key was not found when trying to + * perform a decrypt operation. The operation can be retried after adding + * the correct decryption key. */ public static final int ERROR_NO_KEY = 1; |