summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@quicinc.com>2017-04-25 18:07:55 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-04-25 18:07:55 -0700
commit3e13cf29d7f684e6b116a315a7684c0a747b8bc2 (patch)
tree665a3dd06850ed4017d814ced2072e2ac17673e9 /src
parent811c7a43a2c32861784936407aa9b6a39083f108 (diff)
parent206c758dd02da6486fb6f2386def1a4ea3667696 (diff)
downloadandroid_packages_apps_Snap-3e13cf29d7f684e6b116a315a7684c0a747b8bc2.tar.gz
android_packages_apps_Snap-3e13cf29d7f684e6b116a315a7684c0a747b8bc2.tar.bz2
android_packages_apps_Snap-3e13cf29d7f684e6b116a315a7684c0a747b8bc2.zip
Merge "SnapdragonCamera: catch exception to avoid crash" into camera.lnx.1.0-dev.1.0
Diffstat (limited to 'src')
-rwxr-xr-x[-rw-r--r--]src/com/android/camera/AndroidCameraManagerImpl.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/com/android/camera/AndroidCameraManagerImpl.java b/src/com/android/camera/AndroidCameraManagerImpl.java
index 4decaec6c..987691bb6 100644..100755
--- a/src/com/android/camera/AndroidCameraManagerImpl.java
+++ b/src/com/android/camera/AndroidCameraManagerImpl.java
@@ -431,7 +431,6 @@ class AndroidCameraManagerImpl implements CameraManager {
}
return;
}
- throw e;
}
}
}