diff options
author | Camera Software Integration <camswint@localhost> | 2016-12-20 02:55:22 -0800 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-12-20 02:55:22 -0800 |
commit | fa65f190f19a84650b776cbf9cc5f5cc34a974da (patch) | |
tree | 88da597e0d365b0106a16bce9ac313b018bd3cec | |
parent | d55962ca56c476137d9d3b7c9519236e1ed8615a (diff) | |
parent | 9034c633c5a180dadb3c56567f97863e09d63904 (diff) | |
download | android_packages_apps_Snap-fa65f190f19a84650b776cbf9cc5f5cc34a974da.tar.gz android_packages_apps_Snap-fa65f190f19a84650b776cbf9cc5f5cc34a974da.tar.bz2 android_packages_apps_Snap-fa65f190f19a84650b776cbf9cc5f5cc34a974da.zip |
Merge "SnapdragonCamera:Fix FC cause by Null pointer" into camera.lnx.1.0-dev.1.0
-rwxr-xr-x | src/org/codeaurora/snapcam/filter/ClearSightImageProcessor.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/org/codeaurora/snapcam/filter/ClearSightImageProcessor.java b/src/org/codeaurora/snapcam/filter/ClearSightImageProcessor.java index bd54dc76a..944bf0800 100755 --- a/src/org/codeaurora/snapcam/filter/ClearSightImageProcessor.java +++ b/src/org/codeaurora/snapcam/filter/ClearSightImageProcessor.java @@ -912,6 +912,12 @@ public class ClearSightImageProcessor { mImageEncodeHandler.obtainMessage(MSG_START_CAPTURE).sendToTarget(); short encodeRequest = 0; + /* In same case, timeout will reset ClearSightNativeEngine object, so fields + in the object is not initial, need to return and skip process. + */ + if (ClearSightNativeEngine.getInstance().getReferenceImage(true) == null) { + return; + } long csTs = ClearSightNativeEngine.getInstance().getReferenceImage(true).getTimestamp(); CaptureRequest.Builder csRequest = createEncodeReprocRequest( ClearSightNativeEngine.getInstance().getReferenceResult(true), CAM_TYPE_BAYER); |