aboutsummaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
authorJan-Felix Schmakeit <jfschmakeit@google.com>2015-06-22 16:42:10 +1000
committerJan-Felix Schmakeit <jfschmakeit@google.com>2015-06-22 16:42:10 +1000
commit2b95d3155bdb388d4ecaa29b1c95d0325302c8c6 (patch)
treec5295a82ee08cd2df9a22256b01394592feb5d8a /system
parentbf6597e25d87456eb5e265d6c69f1d54924862bc (diff)
downloadandroid-2b95d3155bdb388d4ecaa29b1c95d0325302c8c6.tar.gz
Fix crash in RuntimePermissions when camera is unavailable.
This fixes a crash when running the sample in an emulator. Change-Id: Ib31465394f6b1f3702204ad82b9bf87264ee327a
Diffstat (limited to 'system')
-rw-r--r--system/RuntimePermissions/Application/src/main/java/com/example/android/system/runtimepermissions/camera/CameraPreviewFragment.java9
1 files changed, 7 insertions, 2 deletions
diff --git a/system/RuntimePermissions/Application/src/main/java/com/example/android/system/runtimepermissions/camera/CameraPreviewFragment.java b/system/RuntimePermissions/Application/src/main/java/com/example/android/system/runtimepermissions/camera/CameraPreviewFragment.java
index d0938f67..871cf757 100644
--- a/system/RuntimePermissions/Application/src/main/java/com/example/android/system/runtimepermissions/camera/CameraPreviewFragment.java
+++ b/system/RuntimePermissions/Application/src/main/java/com/example/android/system/runtimepermissions/camera/CameraPreviewFragment.java
@@ -61,8 +61,13 @@ public class CameraPreviewFragment extends Fragment {
// Open an instance of the first camera and retrieve its info.
mCamera = getCameraInstance(CAMERA_ID);
- Camera.CameraInfo cameraInfo = new Camera.CameraInfo();
- Camera.getCameraInfo(CAMERA_ID, cameraInfo);
+ Camera.CameraInfo cameraInfo = null;
+
+ if (mCamera != null) {
+ // Get camera info only if the camera is available
+ cameraInfo = new Camera.CameraInfo();
+ Camera.getCameraInfo(CAMERA_ID, cameraInfo);
+ }
if (mCamera == null || cameraInfo == null) {
// Camera is not available, display error message