commit b77166b90342504fbf5b1ecbeebcf5598df23b27
author jiaoyuan <jiaoyuan@codeaurora.org> Tue Jan 07 10:49:08 2020 +0800
committer Alexander Martinz <amartinz@shiftphones.com> Wed Sep 29 10:38:42 2021 +0200
tree 165295dcba84bdc12f237da7acfab725414e3bd6
parent 5ef47847dd8eb0b0fa04df192b83cbbfa3671bf7

fix force close when TF

TF before mOriginalCropRegion is setted, add return
when mOriginalCropRegion is null

Change-Id: I7e37fe76d4477268997c45137d9795d971098cec

src/com/android/camera/CaptureModule.java

diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index d4a6c2e..8adfe77 100755
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -6732,7 +6732,7 @@
         if (DEBUG) {
             Log.d(TAG, "triggerFocusAtPoint " + x + " " + y + " " + id);
         }
-        if (mCropRegion[id] == null) {
+        if (mCropRegion[id] == null || mOriginalCropRegion[id] == null) {
             Log.d(TAG, "crop region is null at " + id);
             mInTAF = false;
             return;