diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-05-29 01:30:12 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-05-29 01:30:12 -0700 |
| commit | 823677618c3553797a28f43d8f6173c442d1f331 (patch) | |
| tree | c02c75f5f332481e5fe0a66c33cf00d803114b00 | |
| parent | bda561b961d0e35bfe124f646c6c10fe14beddb2 (diff) | |
| parent | ad4dc2ee97524f58a20f4d40d92b0e3c4f99ac49 (diff) | |
| download | android_packages_apps_Snap-823677618c3553797a28f43d8f6173c442d1f331.tar.gz android_packages_apps_Snap-823677618c3553797a28f43d8f6173c442d1f331.tar.bz2 android_packages_apps_Snap-823677618c3553797a28f43d8f6173c442d1f331.zip | |
Merge "Fix force close when TAF before repeating" into camera-SnapdragonCamera.lnx.2.0
| -rwxr-xr-x | src/com/android/camera/CaptureModule.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java index 907941dd6..e013124a1 100755 --- a/src/com/android/camera/CaptureModule.java +++ b/src/com/android/camera/CaptureModule.java @@ -3297,6 +3297,7 @@ public class CaptureModule implements CameraModule, PhotoController, try { manager = (CameraManager) mActivity.getSystemService(Context.CAMERA_SERVICE); mCameraId[id] = manager.getCameraIdList()[id]; + mOriginalCropRegion[id] = mSettingsManager.getSensorActiveArraySize(id); if (!mCameraOpenCloseLock.tryAcquire(5000, TimeUnit.MILLISECONDS)) { Log.d(TAG, "Time out waiting to lock camera opening."); throw new RuntimeException("Time out waiting to lock camera opening"); |