summaryrefslogtreecommitdiffstats
path: root/src/com/android/camera/util/CameraUtil.java
diff options
context:
space:
mode:
authorjunjiez <junjiez@codeaurora.org>2016-10-10 15:04:37 +0800
committerjunjiez <junjiez@codeaurora.org>2016-10-10 15:04:37 +0800
commit6a6f98f190e68cb1114ec08946ed2d6e11c0a48d (patch)
treec99d21f1ccc6c125e807d4d2647154f6cef36de7 /src/com/android/camera/util/CameraUtil.java
parent795e948c5639f8177c89251014a6935c5343a0e4 (diff)
downloadandroid_packages_apps_Snap-6a6f98f190e68cb1114ec08946ed2d6e11c0a48d.tar.gz
android_packages_apps_Snap-6a6f98f190e68cb1114ec08946ed2d6e11c0a48d.tar.bz2
android_packages_apps_Snap-6a6f98f190e68cb1114ec08946ed2d6e11c0a48d.zip
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
Diffstat (limited to 'src/com/android/camera/util/CameraUtil.java')
-rw-r--r--src/com/android/camera/util/CameraUtil.java2
1 files changed, 2 insertions, 0 deletions
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