summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCamera Software Integration <camswint@localhost>2016-12-11 04:22:16 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2016-12-11 04:22:16 -0800
commitbac6ab2a9bd02955ff43933209c815d0383f049d (patch)
treeffcf338f9dcf8713a16c62a1027c35c9190bb7f6
parent48e03108084542ced798bf02be3543dbd9cacd6c (diff)
parent8a45a901215d7e54b13f72cef289ac8216fc44bf (diff)
downloadandroid_packages_apps_Snap-bac6ab2a9bd02955ff43933209c815d0383f049d.tar.gz
android_packages_apps_Snap-bac6ab2a9bd02955ff43933209c815d0383f049d.tar.bz2
android_packages_apps_Snap-bac6ab2a9bd02955ff43933209c815d0383f049d.zip
Merge "SnapdragonCamera:Camera reinit with wrong id" into camera.lnx.1.0-dev.1.0
-rwxr-xr-x[-rw-r--r--]src/com/android/camera/CaptureModule.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index 2fe7de35c..de3f65c73 100644..100755
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -1034,7 +1034,7 @@ public class CaptureModule implements CameraModule, PhotoController,
}
public void reinit() {
- mSettingsManager.reinit(getMainCameraId());
+ mSettingsManager.init();
}
public boolean isRefocus() {