diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-07-22 18:12:55 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-07-24 01:32:38 -0700 |
| commit | d7681995c64a5a40fe536f00cf2b9ff6c7da218e (patch) | |
| tree | edc1ee03876c76df6418aa0995d136c95e22d707 /src/com/android/camera/CaptureModule.java | |
| parent | f481a909ea52daccf7f2c2a78535c656a972d290 (diff) | |
| parent | 959e8799bdc28dbfc00ce7b7ef38e445b6178946 (diff) | |
Merge changes I834c1163,I9940ecad into camera-SnapdragonCamera.lnx.3.0
* changes:
add switch camera by id in ProMode dev-option
fix conflict of camera settings
Diffstat (limited to 'src/com/android/camera/CaptureModule.java')
| -rwxr-xr-x | src/com/android/camera/CaptureModule.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index 95ce31c73..bcaed2336 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -8149,8 +8149,8 @@ public class CaptureModule implements CameraModule, PhotoController, int getCurrentId() { int cameraId = isBackCamera() ? rearCameraId : frontCameraId; cameraId = isForceAUXOn(this.mode) ? auxCameraId : cameraId; - if ((this.mode == CameraMode.DEFAULT || this.mode == CameraMode.VIDEO) - && mSettingsManager.isDeveloperEnabled()) { + if ((this.mode == CameraMode.DEFAULT || this.mode == CameraMode.VIDEO || + this.mode == CameraMode.PRO_MODE) && mSettingsManager.isDeveloperEnabled()) { String value = mSettingsManager.getValue(SettingsManager.KEY_SWITCH_CAMERA); if (value != null && !value.equals("-1")) { cameraId = Integer.valueOf(value); |