diff options
| author | Camera Software Integration <camswint@localhost> | 2017-01-17 00:22:39 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-01-17 00:22:39 -0800 |
| commit | 108188d9fd71873aa84aa6c5e1e439ed10190f82 (patch) | |
| tree | 2092319a6e83337fe615f03a1b51fc42b8dd9814 /src | |
| parent | e263ff240fc120bc441ee4b44a140dec0263adf2 (diff) | |
| parent | 51e4bebc383fd2cd385bddbb52ca1a9b293343bf (diff) | |
| download | android_packages_apps_Snap-108188d9fd71873aa84aa6c5e1e439ed10190f82.tar.gz android_packages_apps_Snap-108188d9fd71873aa84aa6c5e1e439ed10190f82.tar.bz2 android_packages_apps_Snap-108188d9fd71873aa84aa6c5e1e439ed10190f82.zip | |
Merge "SnapdragonCamera: Fix IOE when setPreviewDisplay" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src')
| -rwxr-xr-x[-rw-r--r--] | src/com/android/camera/AndroidCameraManagerImpl.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/camera/AndroidCameraManagerImpl.java b/src/com/android/camera/AndroidCameraManagerImpl.java index 438be2e90..4decaec6c 100644..100755 --- a/src/com/android/camera/AndroidCameraManagerImpl.java +++ b/src/com/android/camera/AndroidCameraManagerImpl.java @@ -293,7 +293,9 @@ class AndroidCameraManagerImpl implements CameraManager { try { mCamera.setPreviewDisplay((SurfaceHolder) msg.obj); } catch (IOException e) { - throw new RuntimeException(e); + Log.d(TAG,"setPreviewDisplay failed, surface is destoried"); + if (errorCbInstance != null) + errorCbInstance.onStartPreviewFailure(msg.arg1); } return; |