diff options
author | zhuw <zhuw@codeaurora.org> | 2019-04-01 15:10:59 +0800 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-04-23 19:58:16 -0700 |
commit | ad4dc2ee97524f58a20f4d40d92b0e3c4f99ac49 (patch) | |
tree | f17f539dd637c28c827b8b3072fa5d5ba7d30391 | |
parent | e7b55c8d6d823d58ea877b8819ed9669eb94034f (diff) | |
download | android_packages_apps_Snap-ad4dc2ee97524f58a20f4d40d92b0e3c4f99ac49.tar.gz android_packages_apps_Snap-ad4dc2ee97524f58a20f4d40d92b0e3c4f99ac49.tar.bz2 android_packages_apps_Snap-ad4dc2ee97524f58a20f4d40d92b0e3c4f99ac49.zip |
Fix force close when TAF before repeating
init mOriginalCropRegion when open camera to
avoid this.
Change-Id: I3f086475cd8bcdf0087ca20993403e698dd87d79
CRs-Fixed:2426830
-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 df0f43700..344cb66a3 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"); |