diff options
| author | Alan Newberger <alann@google.com> | 2015-06-29 17:49:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-29 17:49:26 +0000 |
| commit | fd6f316adc5abfa071534642688bdf46f47a3925 (patch) | |
| tree | 96631d2f8d09266404bd6afabc3a011555b501ce /src | |
| parent | 62240e14e310aa06601b4d069f30c0190e7b5ef3 (diff) | |
| parent | ef22af43f7769ce6975f674351d29d5fa0df5e07 (diff) | |
| download | android_packages_apps_Camera2-fd6f316adc5abfa071534642688bdf46f47a3925.tar.gz android_packages_apps_Camera2-fd6f316adc5abfa071534642688bdf46f47a3925.tar.bz2 android_packages_apps_Camera2-fd6f316adc5abfa071534642688bdf46f47a3925.zip | |
Merge "Ensure CaptureModule/API2 works without front camera" into ub-camera-haleakala
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/CaptureModule.java | 2 | ||||
| -rw-r--r-- | src/com/android/camera/app/FirstRunDialog.java | 13 | ||||
| -rw-r--r-- | src/com/android/camera/one/v2/Camera2OneCameraManagerImpl.java | 3 |
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 |