diff options
| author | Alan Newberger <alann@google.com> | 2014-09-25 01:10:04 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-25 01:10:04 +0000 |
| commit | af73f89883e9386cf309c029efba19c82597b136 (patch) | |
| tree | cd3724fec563f865cebeda41f470d6bf29f72461 | |
| parent | 9db50c18fdd35f98d45fec66db55693bb9f1d9ae (diff) | |
| parent | 347dccbe1ed10ceec190af4d3797a197426f1caf (diff) | |
| download | android_packages_apps_Camera2-af73f89883e9386cf309c029efba19c82597b136.tar.gz android_packages_apps_Camera2-af73f89883e9386cf309c029efba19c82597b136.tar.bz2 android_packages_apps_Camera2-af73f89883e9386cf309c029efba19c82597b136.zip | |
am 347dccbe: Ensure Camera doesn\'t attempt access of back camera on Nakasi
* commit '347dccbe1ed10ceec190af4d3797a197426f1caf':
Ensure Camera doesn't attempt access of back camera on Nakasi
| -rw-r--r-- | src/com/android/camera/PhotoModule.java | 8 | ||||
| -rw-r--r-- | src/com/android/camera/app/CameraAppUI.java | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 3360122c5..7afa9156e 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -1356,10 +1356,12 @@ public class PhotoModule CameraCapabilities.FocusMode focusMode) { CameraCapabilities.Stringifier stringifier = mCameraCapabilities.getStringifier(); SettingsManager settingsManager = mActivity.getSettingsManager(); - settingsManager.set(mAppController.getCameraScope(), Keys.KEY_FLASH_MODE, - stringifier.stringify(flashMode)); + if (!CameraCapabilities.FlashMode.NO_FLASH.equals(flashMode)) { + settingsManager.set(mAppController.getCameraScope(), Keys.KEY_FLASH_MODE, + stringifier.stringify(flashMode)); + } settingsManager.set(mAppController.getCameraScope(), Keys.KEY_FOCUS_MODE, - stringifier.stringify(focusMode)); + stringifier.stringify(focusMode)); } @Override diff --git a/src/com/android/camera/app/CameraAppUI.java b/src/com/android/camera/app/CameraAppUI.java index 04d61051d..d79f013df 100644 --- a/src/com/android/camera/app/CameraAppUI.java +++ b/src/com/android/camera/app/CameraAppUI.java @@ -1881,7 +1881,8 @@ public class CameraAppUI implements ModeListView.ModeSwitchListener, buttonManager.setToInitialState(); /** Standard mode options */ - if (hardwareSpec.isFrontCameraSupported()) { + if (mController.getCameraProvider().getNumberOfCameras() > 1 && + hardwareSpec.isFrontCameraSupported()) { if (bottomBarSpec.enableCamera) { buttonManager.initializeButton(ButtonManager.BUTTON_CAMERA, bottomBarSpec.cameraCallback); |