diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-11-13 14:50:51 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-11-13 14:50:51 -0800 |
| commit | c8295a16972d2e172bf6a98644fa58980a1824f5 (patch) | |
| tree | b16189921f566167779ff31d0706abae01d6223f /src | |
| parent | 58805e8405e134106ac22cc24535e749ef416e26 (diff) | |
| parent | b5880c50268d1de13201551e3baeec915e460057 (diff) | |
| download | android_packages_apps_Snap-c8295a16972d2e172bf6a98644fa58980a1824f5.tar.gz android_packages_apps_Snap-c8295a16972d2e172bf6a98644fa58980a1824f5.tar.bz2 android_packages_apps_Snap-c8295a16972d2e172bf6a98644fa58980a1824f5.zip | |
Merge "Fix FC of longshot > 64" into camera-SnapdragonCamera.lnx.2.0
Diffstat (limited to 'src')
| -rwxr-xr-x | src/com/android/camera/CaptureModule.java | 2 | ||||
| -rwxr-xr-x | src/com/android/camera/imageprocessor/PostProcessor.java | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index e4bc67169..5ec6f5be9 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -2703,7 +2703,7 @@ public class CaptureModule implements CameraModule, PhotoController, if (mSaveRaw) { mRawImageReader[i] = ImageReader.newInstance(mSupportedRawPictureSize.getWidth(), - mSupportedRawPictureSize.getHeight(), ImageFormat.RAW10, PersistUtil.getLongshotShotLimit()); + mSupportedRawPictureSize.getHeight(), ImageFormat.RAW10, MAX_IMAGEREADERS); mRawImageReader[i].setOnImageAvailableListener(listener, mImageAvailableHandler); } } diff --git a/src/com/android/camera/imageprocessor/PostProcessor.java b/src/com/android/camera/imageprocessor/PostProcessor.java index de14decd7..69e2ecd5c 100755 --- a/src/com/android/camera/imageprocessor/PostProcessor.java +++ b/src/com/android/camera/imageprocessor/PostProcessor.java @@ -722,9 +722,6 @@ public class PostProcessor{ mZSLQueue = new ZSLQueue(mController); } mMaxRequiredImageNum = MAX_REQUIRED_IMAGE_NUM; - if(mController.isLongShotSettingEnabled()) { - mMaxRequiredImageNum = Math.max(MAX_REQUIRED_IMAGE_NUM, PersistUtil.getLongshotShotLimit()+2); - } mPendingContinuousRequestCount = 0; } |