Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5bb242af authored by Robert Shih's avatar Robert Shih
Browse files

libmedia_jni requiresSecureDecoder: throw on error 

Bug: 164486735
Test: MediaDrmTest
Change-Id: I2a062e6bd73630621fd022fcb0d640f812a7a8eb
parent f343ef31

media/jni/android_media_MediaDrm.cpp

+9 −2
Original line number Diff line number Diff line
@@ -2002,10 +2002,17 @@ static jboolean android_media_MediaDrm_requiresSecureDecoder( 
        return JNI_FALSE;

    }



    bool required = false;

    status_t err = OK;

    if (securityLevel == DrmPlugin::kSecurityLevelMax) {

        return drm->requiresSecureDecoder(mimeType.c_str());

        err = drm->requiresSecureDecoder(mimeType.c_str(), &required);

    } else {

        err = drm->requiresSecureDecoder(mimeType.c_str(), securityLevel, &required);

    }

    if (throwExceptionAsNecessary(env, drm, err, "Failed to query secure decoder requirement")) {

        return false;

    }

    return drm->requiresSecureDecoder(mimeType.c_str(), securityLevel);

    return required;

}



static void android_media_MediaDrm_setPlaybackId(