diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2015-08-16 01:34:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-16 01:34:42 +0000 |
| commit | eec25a4ffecc0c9a726aa284d29d0b7a1e58a888 (patch) | |
| tree | 9da0cd71431f31af5fe560a37fe14619e539527a /core/jni/android_hardware_Camera.cpp | |
| parent | a99dd2c94448efc246ee2326912532f20bb38311 (diff) | |
| parent | 1017f9862fb2cdfbff0abe12ef7d20b657a38e36 (diff) | |
| download | frameworks_base-eec25a4ffecc0c9a726aa284d29d0b7a1e58a888.zip frameworks_base-eec25a4ffecc0c9a726aa284d29d0b7a1e58a888.tar.gz frameworks_base-eec25a4ffecc0c9a726aa284d29d0b7a1e58a888.tar.bz2 | |
am 1017f986: Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev
* commit '1017f9862fb2cdfbff0abe12ef7d20b657a38e36':
Camera2: Add camera type to getNumberOfCameras.
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"); |