am 1cef126a: am fd6f316a: Merge "Ensure CaptureModule/API2 works without front camera" into ub-camera-haleakala

* commit '1cef126a6de13b002f0caf55963fe0b48de00546':
  Ensure CaptureModule/API2 works without front camera

3 files changed, 12 insertions, 6 deletions

diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index a3f728c9d..640da4fd5 100644
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -773,7 +773,7 @@ public class CaptureModule extends CameraModule implements
         return new HardwareSpec() {
             @Override
             public boolean isFrontCameraSupported() {
-                return true;
+                return mOneCameraManager.hasCameraFacing(Facing.FRONT);
             }
 
             @Override
diff --git a/src/com/android/camera/app/FirstRunDialog.java b/src/com/android/camera/app/FirstRunDialog.java
index c3a3f889b..d810c4b7a 100644
--- a/src/com/android/camera/app/FirstRunDialog.java
+++ b/src/com/android/camera/app/FirstRunDialog.java
@@ -21,6 +21,7 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.view.ViewGroup;
 
+import com.android.camera.device.CameraId;
 import com.android.camera.exif.Rational;
 import com.android.camera.one.OneCamera.Facing;
 import com.android.camera.one.OneCameraAccessException;
@@ -157,10 +158,14 @@ public class FirstRunDialog {
             public void onConfirm(Rational aspectRatio) {
                 // Change resolution setting based on the chosen aspect ratio.
                 try {
-                    mResolutionSetting.setPictureAspectRatio(
-                          mOneCameraManager.findFirstCameraFacing(Facing.BACK), aspectRatio);
-                    mResolutionSetting.setPictureAspectRatio(
-                          mOneCameraManager.findFirstCameraFacing(Facing.FRONT), aspectRatio);
+                    CameraId backCameraId = mOneCameraManager.findFirstCameraFacing(Facing.BACK);
+                    if (backCameraId != null) {
+                        mResolutionSetting.setPictureAspectRatio(backCameraId, aspectRatio);
+                    }
+                    CameraId frontCameraId = mOneCameraManager.findFirstCameraFacing(Facing.FRONT);
+                    if (frontCameraId != null) {
+                        mResolutionSetting.setPictureAspectRatio(frontCameraId, aspectRatio);
+                    }
                 } catch (OneCameraAccessException ex) {
                     mListener.onCameraAccessException();
                     return;
diff --git a/src/com/android/camera/one/v2/Camera2OneCameraManagerImpl.java b/src/com/android/camera/one/v2/Camera2OneCameraManagerImpl.java
index 0b766a5a8..a4b5a9b1d 100644
--- a/src/com/android/camera/one/v2/Camera2OneCameraManagerImpl.java
+++ b/src/com/android/camera/one/v2/Camera2OneCameraManagerImpl.java
@@ -99,7 +99,8 @@ public class Camera2OneCameraManagerImpl implements OneCameraManager {
 
     @Override
     public CameraId findFirstCameraFacing(@Nonnull Facing facing) {
-        return CameraId.from(findCameraId(facing));
+        String cameraId = findCameraId(facing);
+        return (cameraId != null) ? CameraId.from(cameraId) : null;
     }
 
     @Override