Merge "MediaCrypto's constructor can throw RuntimeException."

Author: theandi666

api/current.txt

@@ -10996,7 +10996,7 @@ package android.media {
   }
 
   public final class MediaCrypto {
-    ctor public MediaCrypto(byte[], byte[]);
+    ctor public MediaCrypto(byte[], byte[]) throws java.lang.RuntimeException;
     method public static final boolean isCryptoSchemeSupported(byte[]);
     method public final void release();
     method public final boolean requiresSecureDecoderComponent(java.lang.String);

media/java/android/media/MediaCrypto.java

@@ -37,7 +37,7 @@ public final class MediaCrypto {
       * @param uuid The UUID of the crypto scheme.
       * @param initData Opaque initialization data specific to the crypto scheme.
     */
-    public MediaCrypto(byte[] uuid, byte[] initData) {
+    public MediaCrypto(byte[] uuid, byte[] initData) throws RuntimeException {
         native_setup(uuid, initData);
     }
 

media/jni/android_media_MediaCrypto.cpp

@@ -210,7 +210,7 @@ static void android_media_MediaCrypto_native_setup(
     if (err != OK) {
         jniThrowException(
                 env,
-                "java/io/IOException",
+                "java/lang/RuntimeException",
                 "Failed to instantiate crypto object.");
         return;
     }