commit e032d5034bb8e2f96509e14004fb0dd41b9e9764
author Jan-Felix Schmakeit <jfschmakeit@google.com> Mon Jun 29 05:55:47 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 29 05:55:49 2015 +0000
tree a6da508e322d875ba0f9dd76fb89d669c2435eaa
parent 7d6959e5eadeead8666d03a0dc29458b41e28202
parent 2b95d3155bdb388d4ecaa29b1c95d0325302c8c6

Merge "Fix crash in RuntimePermissions when camera is unavailable." into mnc-dev

system/RuntimePermissions/Application/src/main/java/com/example/android/system/runtimepermissions/camera/CameraPreviewFragment.java

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 d0938f6..871cf75 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 @@
 
         // 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