summaryrefslogtreecommitdiffstats
path: root/core/jni/android_hardware_camera2_legacy_LegacyCameraDevice.cpp
diff options
context:
space:
mode:
authorRuben Brunk <rubenbrunk@google.com>2015-03-12 20:54:03 -0700
committerRuben Brunk <rubenbrunk@google.com>2015-03-17 17:49:29 +0000
commit443ab2c7dbe2a3a482892f3171882572f10eab9a (patch)
tree9d53d074d4e030a1868c0d8aba665a328d87d4b8 /core/jni/android_hardware_camera2_legacy_LegacyCameraDevice.cpp
parentdd7d025b97aa09723f1695f23b85d1d926cb7ea1 (diff)
downloadframeworks_base-443ab2c7dbe2a3a482892f3171882572f10eab9a.zip
frameworks_base-443ab2c7dbe2a3a482892f3171882572f10eab9a.tar.gz
frameworks_base-443ab2c7dbe2a3a482892f3171882572f10eab9a.tar.bz2
camera2: Release surface in ImageReader#close and fix legacy cleanup
Bug: 19694090 Change-Id: I344ad707dbd414db023e4770769b5237bd3bbb4e
Diffstat (limited to 'core/jni/android_hardware_camera2_legacy_LegacyCameraDevice.cpp')
-rw-r--r--core/jni/android_hardware_camera2_legacy_LegacyCameraDevice.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/jni/android_hardware_camera2_legacy_LegacyCameraDevice.cpp b/core/jni/android_hardware_camera2_legacy_LegacyCameraDevice.cpp
index 0a6fb9d..8f38ae5 100644
--- a/core/jni/android_hardware_camera2_legacy_LegacyCameraDevice.cpp
+++ b/core/jni/android_hardware_camera2_legacy_LegacyCameraDevice.cpp
@@ -373,8 +373,7 @@ static sp<ANativeWindow> getNativeWindow(JNIEnv* env, jobject surface) {
return NULL;
}
if (anw == NULL) {
- jniThrowExceptionFmt(env, "java/lang/IllegalArgumentException",
- "Surface had no valid native window.");
+ ALOGE("%s: Surface had no valid native window.", __FUNCTION__);
return NULL;
}
return anw;