diff options
| author | 2022-06-03 20:21:32 +0000 | |
|---|---|---|
| committer | 2022-06-03 20:21:32 +0000 | |
| commit | 2edaa3a126c155bf4074f97500281b0e81bd4e29 (patch) | |
| tree | abed671e8616e0a52f18a01bafd549794127a1f7 | |
| parent | e109c7886749eb216807c6dc3b464770f243d9b9 (diff) | |
| parent | fee968da454bad68dc3ea4b63a0402b46a75d32d (diff) | |
Merge "media: return null when there are no CamcorderProfiles for getAll" into tm-dev
| -rw-r--r-- | media/java/android/media/CamcorderProfile.java | 2 | ||||
| -rw-r--r-- | media/jni/android_media_MediaProfiles.cpp | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/media/java/android/media/CamcorderProfile.java b/media/java/android/media/CamcorderProfile.java index 3dbb8e0986f0..2643b0115d01 100644 --- a/media/java/android/media/CamcorderProfile.java +++ b/media/java/android/media/CamcorderProfile.java @@ -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 diff --git a/media/jni/android_media_MediaProfiles.cpp b/media/jni/android_media_MediaProfiles.cpp index f2c48a04935f..ecb1d510f807 100644 --- a/media/jni/android_media_MediaProfiles.cpp +++ b/media/jni/android_media_MediaProfiles.cpp @@ -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; } |