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

Commit 60d77960 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "media: return null when there are no CamcorderProfiles for getAll" into... 

Merge "media: return null when there are no CamcorderProfiles for getAll" into tm-dev am: 2edaa3a1

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18721254



Change-Id: Ia44f6eec201856cb11beeb5ed719d102e36f8e51
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b4647da9 2edaa3a1

media/java/android/media/CamcorderProfile.java

+1 −1
Original line number Diff line number Diff line
@@ -537,7 +537,7 @@ public class CamcorderProfile 
    public static final long RETURN_ADVANCED_VIDEO_PROFILES = 206033068L; // buganizer id



    /**

     * Returns all basic encoder profiles of a camcorder profile for

     * Returns all encoder profiles of a camcorder profile for

     * the given camera at the given quality level.

     * <p>

     * Quality levels QUALITY_LOW, QUALITY_HIGH are guaranteed to be supported, while

media/jni/android_media_MediaProfiles.cpp

+0 −2
Original line number Diff line number Diff line
@@ -236,8 +236,6 @@ android_media_MediaProfiles_native_get_camcorder_profiles(JNIEnv *env, jobject / 
    camcorder_quality q = static_cast<camcorder_quality>(quality);

    const MediaProfiles::CamcorderProfile *cp = sProfiles->getCamcorderProfile(id, q);

    if (!cp) {

        jniThrowException(env, "java/lang/RuntimeException",

                          "Error retrieving camcorder profile params");

        return NULL;

    }