diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2015-08-14 13:11:16 -0700 |
|---|---|---|
| committer | Eino-Ville Talvala <etalvala@google.com> | 2015-08-14 14:52:57 -0700 |
| commit | 5717612ba9ac78021e81f5b45ca7903c318499f9 (patch) | |
| tree | 91d5b680930f5fda68c41e727a15e42231367c9d /core/jni/android_hardware_Camera.cpp | |
| parent | f75577295765ca13bf3d0d5bffa81b569cb88da2 (diff) | |
| download | frameworks_base-5717612ba9ac78021e81f5b45ca7903c318499f9.zip frameworks_base-5717612ba9ac78021e81f5b45ca7903c318499f9.tar.gz frameworks_base-5717612ba9ac78021e81f5b45ca7903c318499f9.tar.bz2 | |
Camera2: Add camera type to getNumberOfCameras.
Do not list strange cameras in old API; ensure new API gets all
cameras.
Bug: 23194168
Change-Id: Ia1fdffac245525674c913fefb1ec06e9094fe8d3
Diffstat (limited to 'core/jni/android_hardware_Camera.cpp')
| -rw-r--r-- | core/jni/android_hardware_Camera.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/core/jni/android_hardware_Camera.cpp b/core/jni/android_hardware_Camera.cpp index 169fb60..4f44c26 100644 --- a/core/jni/android_hardware_Camera.cpp +++ b/core/jni/android_hardware_Camera.cpp @@ -497,6 +497,12 @@ static void android_hardware_Camera_getCameraInfo(JNIEnv *env, jobject thiz, jint cameraId, jobject info_obj) { CameraInfo cameraInfo; + if (cameraId >= Camera::getNumberOfCameras() || cameraId < 0) { + ALOGE("%s: Unknown camera ID %d", __FUNCTION__, cameraId); + jniThrowRuntimeException(env, "Unknown camera ID"); + return; + } + status_t rc = Camera::getCameraInfo(cameraId, &cameraInfo); if (rc != NO_ERROR) { jniThrowRuntimeException(env, "Fail to get camera info"); |