summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCamera Software Integration <camswint@localhost>2016-12-01 09:16:48 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2016-12-01 09:16:48 -0800
commitcf13881fbaf0fbb45611295cbd19f1258b359bfb (patch)
treeeca7c60c9d313bba2292f896ac14a1148704a586
parent42413bd3b8c7e363f6a4e5443f3f93913f2349ec (diff)
parent1cc5cc1ff76b11c85ea33798b1af900fd686181f (diff)
downloadandroid_packages_apps_Snap-cf13881fbaf0fbb45611295cbd19f1258b359bfb.tar.gz
android_packages_apps_Snap-cf13881fbaf0fbb45611295cbd19f1258b359bfb.tar.bz2
android_packages_apps_Snap-cf13881fbaf0fbb45611295cbd19f1258b359bfb.zip
Merge "SnapdragonCamera: Fix Camera2 FC AlertDialog occur WindowLeaked" into camera.lnx.1.0-dev.1.0
-rw-r--r--src/com/android/camera/CaptureModule.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index c45496c1f..51bb013c5 100644
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -912,6 +912,9 @@ public class CaptureModule implements CameraModule, PhotoController,
@Override
public void onConfigureFailed(CameraCaptureSession cameraCaptureSession) {
Log.e(TAG, "cameracapturesession - onConfigureFailed "+id);
+ if (mActivity.isFinishing()) {
+ return;
+ }
new AlertDialog.Builder(mActivity)
.setTitle("Camera Initialization Failed")
.setMessage("Closing SnapdragonCamera")