diff options
| author | 2022-06-04 00:12:36 +0000 | |
|---|---|---|
| committer | 2022-06-04 00:12:36 +0000 | |
| commit | 2b5072afb9bdd7f5bb86cf9ba940d7cd991449a5 (patch) | |
| tree | 3441712c229caae01c34445d6a8e5d8e63641b8d | |
| parent | f53517ce2deaaff29a3cce96d6082b1d4e48ba9e (diff) | |
| parent | 2edaa3a126c155bf4074f97500281b0e81bd4e29 (diff) | |
Merge "media: return null when there are no CamcorderProfiles for getAll" into tm-dev am: 2edaa3a126
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18721254
Change-Id: I5a9d4118b94d1cbbdfaa6a1dce088325f5090d3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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; } |