From 6a6f98f190e68cb1114ec08946ed2d6e11c0a48d Mon Sep 17 00:00:00 2001
From: junjiez <junjiez@codeaurora.org>
Date: Mon, 10 Oct 2016 15:04:37 +0800
Subject: SnapdragonCamera:Fix crash when show dialog

Don't show the error dialog when the activity is
null or is finished to avoid BadTokenException.

Change-Id: I4f32ab67fa3d6c96637aab2292778f45300c338a
CRs-Fixed: 1069308
---
 src/com/android/camera/util/CameraUtil.java | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/com/android/camera/util/CameraUtil.java')

diff --git a/src/com/android/camera/util/CameraUtil.java b/src/com/android/camera/util/CameraUtil.java
index fb15f1c5d..1cdfd285a 100644
--- a/src/com/android/camera/util/CameraUtil.java
+++ b/src/com/android/camera/util/CameraUtil.java
@@ -360,6 +360,8 @@ public class CameraUtil {
     }
 
     public static void showErrorAndFinish(final Activity activity, int msgId) {
+        if (activity == null || activity.isFinishing())
+            return;
         DialogInterface.OnClickListener buttonListener =
                 new DialogInterface.OnClickListener() {
             @Override
-- 
cgit v1.2.3