Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
TreeHugger Robot
2022-06-04 00:12:36 +00:00
committed by Automerger Merge Worker
parent f53517ce2d 2edaa3a126
commit 2b5072afb9
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media/java/android/media/CamcorderProfile.java
View File

@@ -537,7 +537,7 @@ public class CamcorderProfile
public static final long RETURN_ADVANCED_VIDEO_PROFILES = 206033068L; // buganizer id 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. * the given camera at the given quality level.
* <p> * <p>
* Quality levels QUALITY_LOW, QUALITY_HIGH are guaranteed to be supported, while * Quality levels QUALITY_LOW, QUALITY_HIGH are guaranteed to be supported, while

2
media/jni/android_media_MediaProfiles.cpp
View File

@@ -236,8 +236,6 @@ android_media_MediaProfiles_native_get_camcorder_profiles(JNIEnv *env, jobject /
camcorder_quality q = static_cast<camcorder_quality>(quality); camcorder_quality q = static_cast<camcorder_quality>(quality);
const MediaProfiles::CamcorderProfile *cp = sProfiles->getCamcorderProfile(id, q); const MediaProfiles::CamcorderProfile *cp = sProfiles->getCamcorderProfile(id, q);
if (!cp) { if (!cp) {
jniThrowException(env, "java/lang/RuntimeException",
"Error retrieving camcorder profile params");
return NULL; return NULL;
} }